增加了database_cleaner的gem和相关设置
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock