update modeluser
Finish localstorage
Merged 'dev'.

Conflicts:
	app/base/main.js
	app/comps/user/userModel-srvc.js