complete user resgeistion model and view
Merge branch 'master' of https://github.com/zhouhang/pingtai

Conflicts:
	app/views/layouts/home.html.erb