testo
Merge branch 'master' of https://github.com/bobbylinux/Condor

Conflicts:
	app/views/categorie/index.blade.php
Merge branch 'master' of https://github.com/bobbylinux/Condor

Conflicts:
	app/views/categorie/index.blade.php
Merge branch 'master' of https://github.com/bobbylinux/Condor