Restructured the project
Merge branch 'master' of https://github.com/saurajit/spring-angular

Conflicts:
	index.html
Restructured the project