hdgz
Merge branch 'master' of github.com:chinawhere/clever_workplace

Conflicts:
	app/controllers/clever_work_controller.rb