crew
Merge branch 'master' of https://github.com/cloudband-solutions/crewmanagement-pis.git

Conflicts:
	app/assets/stylesheets/mediaqueries.css.scss