权限功能屏蔽
devise
stop tracking log and database.yml
Merge branch 'dev' of https://github.com/rongyiwang/rongyi_term_cms into dev

# By dark
# Via dark
* 'dev' of https://github.com/rongyiwang/rongyi_term_cms:
  devise
弃用 rmagick
发布可以在windows下开发的环境
Merge branch 'dev'

Conflicts:
	app/views/layouts/_nav.html.slim