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