setting up pipeline
pipeline 2
Merge branch 'development' of https://github.com/Evercise/evercise into development

Conflicts:
	app/assets/stylesheets/evercise.css.less
	app/views/layouts/master.blade.php
	bootstrap/start.php