Merge branch 'master' into context_button_bar_width
[situare] / res / images / back_btn.png
res/images/back_btn.png