bugfix save empty markertypes
Bugfix for Invalid argument supplied for foreach()
colors ;-)
delete marker types, marker order, display bugfixes
Merge branch 'dev'

Conflicts:
	admin/views/admin.php