Merge branch 'develop' into pull_down_refresh
authormasensio <masensio@solidgear.es>
Tue, 3 Jun 2014 08:23:47 +0000 (10:23 +0200)
committermasensio <masensio@solidgear.es>
Tue, 3 Jun 2014 08:23:47 +0000 (10:23 +0200)

Trivial merge