bootstrap chnages
Merge branch 'master' of https://github.com/sudorails/e_verification

Conflicts:
	app/views/reports/index.html.erb
	config/database.yml