last changes
Merge branch 'master' of https://github.com/chus1818/company_web

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