new commit
Merge branch 'master' of https://github.com/sudorails/e_verification

Conflicts:
	app/views/dashboards/_media.html.erb
	config/database.yml