[Thingmy]
Merge branch 'master' of github.com:insin/lmms

Conflicts:
	projects/Thingmy.mmp