images update
conflict fixed

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

Conflicts:
	public/assets/active_admin-e83db7a72e29ba1c12da96c5dd2bfe80.css.gz
	public/assets/active_admin.css.gz
	public/assets/active_admin.js.gz
	public/assets/active_admin/application-3bd14daba4c06f4e415110a3ba33b183.js.gz
	public/assets/active_admin/application.js.gz
	public/assets/active_admin/pages/application-8fb10c140ae68845fb4ace936938d995.js.gz
	public/assets/active_admin/pages/application.js.gz
	public/assets/active_admin/print-7da800b211a86c0e756177dfb1fd2a3e.css.gz
	public/assets/active_admin/print.css.gz
	public/assets/application-475bb03b2d67c0722168e10f5308e8e1.js.gz
	public/assets/application.css
	public/assets/application.css.gz
	public/assets/application.js
	public/assets/application.js.gz
	public/assets/bootstrap.css
	public/assets/bootstrap.css.gz
	public/assets/manifest.yml
database.yml
Merge branch 'master' of https://github.com/sudorails/e_verification
report updated