Cleaning up and doing some renaming
Merge branch 'master' of https://github.com/mickatcgi/spring-rest-angular-demo

Forced merge of github content