cleanup
ad
Merge branch '1.2-dev' of github.com:mxaGianluca/eonqm into 1.2-dev

Conflicts:
	fuel/app/classes/controller/back/projects.php
Merge branch '1.2-dev' of github.com:mxaGianluca/eonqm into 1.2-dev