huge cleanup
cleanupMerge remote-tracking branch 'origin/master'

Conflicts:
	org.kevoree.modeling.microframework/src/main/java/org/kevoree/modeling/api/xmi/XmlParser.java
Merge remote-tracking branch 'origin/master'