Converted to Eliom 4 and started refactoring
Merge branch 'develop' of github.com:chsticksel/kind1 into develop