Merge branch 'hotfix/2.1.1'
Merge branch 'release/2.2'
Bumped version number to 2.2.1
Fixed wrong name of resource file in ship_ext_tmplt_edb
Merge branch 'hotfix/2.2.1' into develop

Conflicts:
	setup.py
Added a how-to for hotfixes to the README