Merge branch 'ruben' into develop
Merge branch 'develop' of https://github.com/hashie5/app into develop