assets:precompile; Gemfile
Merge branch 'master' of github.com:RasoTeam/platform

Conflicts:
	public/assets/application-2d520f2f08ecd6468bfc476e685f92aa.js.gz
	public/assets/application.css
	public/assets/application.css.gz
	public/assets/application.js.gz
	public/assets/manifest.yml
	public/assets/public/application-7270767b2a9e9fff880aa5de378ca791.css.gz
	public/assets/public/application.css.gz