stupid chagnes
Merge branch 'master' of https://github.com/smaccm/smaccm

Conflicts:
	models/Smaccmcopter/SOFTWARE.aadl