reformat code
Merge branch 'master' of git://github.com/fracasula/AdManagerBundle

Conflicts:
	Admin/AdAdmin.php
reformat code