Merge branch 'develop' into community_image-preview-save-position
authorjabarros <jabarros@solidgear.es>
Thu, 11 Dec 2014 09:23:03 +0000 (10:23 +0100)
committerjabarros <jabarros@solidgear.es>
Thu, 11 Dec 2014 09:23:03 +0000 (10:23 +0100)

Trivial merge