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