Update the new database from Emma
Merge branch 'master' of https://github.com/teheavy/AMA3D

Conflicts:
	Schematikon_2_0.3.mwb