set sessions
Merge branch 'master' of https://github.com/smglg/myweb

Conflicts:
	app.js
	public/app/modules/views/loginShow.js
	public/app/router.js
	public/app/templates/registry.html
	public/vendor/jam/lodash/lodash.js
	routes/user.js