carrierwave storage in amazon s3
Merge branch 'master' of https://github.com/chus1818/company_web

Conflicts:
	public/assets/application-528fe0dbee7b6f62bfdc69e46c82e47d.js.gz
	public/assets/application.css
	public/assets/application.css.gz
	public/assets/application.js.gz
	public/assets/manifest.yml