Show list
Clear list
Refactor
Merge remote-tracking branch 'origin/master' into mvc
Fix XML Base
Merge remote-tracking branch 'origin/master' into mvc

Conflicts:
	src/main/java/fr/insalyon/optimod/controllers/ApplicationController.java
	src/main/java/fr/insalyon/optimod/models/factories/XMLFactoryBase.java
Merge pull request #7 from hexanom/mvc

Mvc