version no update
Merge branch 'master' of github.com:ICEACE/FLAME

Conflicts:
	model_v0.1.0.xml