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

Conflicts:
	app/bloc_category.php