classmanager
Merge branch 'master' of https://github.com/Shadownest/Promo-S1
Merge branch 'master' of https://github.com/Shadownest/Promo-S1
Merge branch 'master' of https://github.com/Shadownest/Promo-S1
mathieu
Merge branch 'master' of https://github.com/Shadownest/Promo-S1

Conflicts:
	app/bloc_subject.php
	models/CategoryManager.class.php
	models/UserManager.class.php
	views/bloc_subject.phtml