Conf clock.is_local
Merge branch 'master' of https://github.com/iNowa/MIWA2014

Conflicts:
	BaseApplication/src/fr/epita/sigl/miwa/st/ConfigurationContainer.java