Exceptions DONE
Properties DONE
Merge branch 'master' of https://github.com/mehdif/OptimodLyon

Conflicts:
	src/controleur/Application.java