Run instruments completely without binary templates
Use git to creat zip instead of managing zip contenst manually
Merge branch 'master' into move-tests-to-separte-files

Conflicts:
	Makefile
Run instruments completely without binary templates
Use git to creat zip instead of managing zip contenst manually
yada-yada