Merge branch 'develop' into improve_action_bar_pr_392_with_develop
authormasensio <masensio@solidgear.es>
Wed, 2 Apr 2014 08:45:52 +0000 (10:45 +0200)
committermasensio <masensio@solidgear.es>
Wed, 2 Apr 2014 08:45:52 +0000 (10:45 +0200)

Trivial merge