Cache has been commited. Fail.
Merge branch 'master' of https://github.com/dgafka/Gitbox-site

Conflicts:
	app/cache/dev/annotations/f6a2ef741e1d37ac024dd4a35c40796894c1f545#indexAction.cache.php
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.php.meta
	app/cache/dev/appDevDebugProjectContainer.xml
	app/cache/dev/appDevDebugProjectContainerCompiler.log
	app/cache/dev/appDevUrlGenerator.php
	app/cache/dev/appDevUrlGenerator.php.meta
	app/cache/dev/appDevUrlMatcher.php
	app/cache/dev/appDevUrlMatcher.php.meta
	app/cache/dev/classes.php.meta
	app/cache/dev/profiler/index.csv
	app/logs/dev.log
Upgrade