Merge branch 'master' of github.com:baardev/btcg2

Conflicts:
	src/Btcg/MainBundle/Controller/PostController.php