注册
Merge branch 'development' of github.com:cwcf/cwcf-cms-v1 into development

# By Zeng WeiMao
# Via Zeng WeiMao
* 'development' of github.com:cwcf/cwcf-cms-v1:
  user login

Conflicts:
	app/controllers/refinery/sessions_controller.rb
	app/views/layouts/application.html.erb