Account activation flow
Merge branch 'master' of https://github.com/milhad-mistral/CarPortalDemo

Conflicts:
	CarPortalDemo.Web/Client/app/app.js
	CarPortalDemo.Web/Client/app/index.html
	CarPortalDemo.Web/Client/app/user/services/userService.js