Adding user api calls
Merge branch 'develop' of github.com:justincdalton/hackathon-ts-app into develop

Conflicts:
	src/app/main/main.html
Adding current user service and ngMessages