Add AdminBundle & SchoolBundle
Merge origin/master

Conflicts:
	app/config/security.yml
Merge origin/master

Conflicts:
	app/config/security.yml