add CarrierWave to mantance upload images
Merge pull request #27 from magicHu/master

主页面初版
1. 增加菜单种类kind
2. 增加菜单项item
3. 增加图片附件类attachment
Merge branch 'master' of https://github.com/liyijie/peafowl into liyijie-master

Conflicts:
	client_web/Gemfile.lock
Merge branch 'master' of https://github.com/magicHu/peafowl into magichu-master

Conflicts:
	client_web/config/routes.rb
	client_web/db/schema.rb
add checkout