register ui bug
Merge branch 'master' of https://github.com/brucewar/share_picture
fix bug
Conflicts:
	app.js
	build/generate_models.sh
	db.js
	package.json
	views/user/register.html
text fix bug
Merge branch 'master' of https://github.com/brucewar/share_picture

Conflicts:
	controllers/user.js
	views/user/register.html
fix ui bug