Gestion de la clock en factory
Merge branch 'master' of https://github.com/iNowa/MIWA2014

Conflicts:
	BaseApplication/conf/config.properties