update
Merge branch 'master' of github.com:dttungsyn/node-authen

Conflicts:
	app/routes.js