add profile page controller;
add to routing profile page;
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/app.js
asd
asd
Merge branch 'master' of https://github.com/ncosmin2001/angular1