Profile-wip
Merge branch 'master' of https://github.com/jkuru/Angular

Conflicts:
	src/main/webapp/index.html