testcommit
Merge branch 'test'

Conflicts:
	src/Test/GridBundle/Controller/DefaultController.php
added needed backups