Merge remote-tracking branch 'origin/master'

Conflicts:
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.php.meta
	app/cache/dev/appDevUrlGenerator.php
	app/cache/dev/appDevUrlMatcher.php
	app/cache/dev/profiler/index.csv
	app/logs/dev.log
	src/Blogger/BlogBundle/Controller/PageController.php
	src/Blogger/BlogBundle/Resources/config/routing.yml
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.php.meta
	app/cache/dev/appDevUrlGenerator.php
	app/cache/dev/appDevUrlMatcher.php
	app/cache/dev/profiler/index.csv
	app/logs/dev.log
	src/Blogger/BlogBundle/Controller/PageController.php
	src/Blogger/BlogBundle/Resources/config/routing.yml
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.php.meta
	app/cache/dev/appDevUrlGenerator.php
	app/cache/dev/appDevUrlMatcher.php
	app/cache/dev/profiler/index.csv
	app/logs/dev.log
	src/Blogger/BlogBundle/Controller/PageController.php
	src/Blogger/BlogBundle/Resources/config/routing.yml
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/phpunit.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.php.meta
	app/cache/dev/appDevUrlGenerator.php
	app/cache/dev/appDevUrlMatcher.php
	app/cache/dev/profiler/index.csv
	app/logs/dev.log
	src/Blogger/BlogBundle/Controller/PageController.php
	src/Blogger/BlogBundle/Resources/config/routing.yml
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.php.meta
	app/cache/dev/appDevUrlGenerator.php
	app/cache/dev/appDevUrlMatcher.php
	app/cache/dev/profiler/index.csv
	app/logs/dev.log
	src/Blogger/BlogBundle/Controller/PageController.php
	src/Blogger/BlogBundle/Resources/config/routing.yml