bootstrap
Merge branch 'master' of https://github.com/Chris2408/Barometer

Conflicts:
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.xml
	app/cache/dev/appDevUrlGenerator.php.meta
	app/cache/dev/profiler/index.csv
	app/logs/dev.log