[Admin] Ready for teacher administration
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Ufuturelabs/Ufuturedesk/AdminBundle/Resources/config/routing/admin.yml
Update .gitignore