merge test added
Merge branch 'master' of github.com:dukeboard/kevoree-modeling-framework