PULL AVANT D'EDIT - Indentation plus changement nom des fichiers !
Merge branch 'master' of https://github.com/hitema-bachdev-2015/palaba

Conflicts:
	ajax/script-addtask.php
	ajax/script_addcategory.php
	classes/Tools.php
	index.php
	js/script.js
Merge branch 'master' of https://github.com/hitema-bachdev-2015/palaba