Edit registers form
Add placeholder
Merge branch 'master' of https://github.com/zhengweiyu/conrad

Conflicts:
	app/views/registers/_form.html.erb