Remove unuse files and modify some gem
Modify active body h font-size
Remove conflict file
Merge branch 'master' of github.com:xunlian/rails-night into xunlian-master

Conflicts:
	Gemfile