Changed stuff
Merge branch 'develop' of https://github.com/EthicalCode/webapp into develop