add PurlModel
update Purl Handling
clean
Merged 'dev'.
moep
moep
moep 3
remove nav-tabs from registration
update
bugfix
refactor cmAuth with token
Merged 'dev'.
refactor cmUserModel Tests
rm console.log
Merged 'dev'.

Conflicts:
	app/comps/user/login-drtv.js
	app/comps/user/userModel-srvc-old.js
update
Finish refactor-conversation