combine the front-end js and uglify them
Merge branch 'master' into develop
Merge branch 'master' into develop
tidy models
Merge pull request #9 from DonaldIsFreak/develop

Big change