fix bug tag
fix test conflict

Merge branch 'master' of https://github.com/omegas27/CAeSAR

Conflicts:
	src/Caesar/AdminBundle/Tests/Controller/UserAddTest.php