luping0310
Merge branch 'master' of github.com:lifang/weixin_job

Conflicts:
	app/assets/javascripts/main.js
	config/routes.rb
luping03102
Merge branch 'master' of github.com:lifang/weixin_job