Merge branch 'master' into context_driven_buttons, review
[situare] / res / images / contact_btn.png
res/images/contact_btn.png