Merge branch 'develop' into improve_action_bar_pr_392_with_develop
authormasensio <masensio@solidgear.es>
Thu, 3 Apr 2014 09:11:13 +0000 (11:11 +0200)
committermasensio <masensio@solidgear.es>
Thu, 3 Apr 2014 09:11:13 +0000 (11:11 +0200)

Trivial merge