Tentative de correction d'un bug sur le serveur webfaction
Merge branch 'master' of https://github.com/10MOhm/puncher

Conflicts:
	application/libraries/Time_manager.php