Merge branch 'develop' into remove_ActionBarSherlock
authormasensio <masensio@solidgear.es>
Wed, 27 May 2015 11:10:15 +0000 (13:10 +0200)
committermasensio <masensio@solidgear.es>
Wed, 27 May 2015 11:10:15 +0000 (13:10 +0200)

Trivial merge