ok
Merge branch 'master' of https://github.com/LEI/Gladiator

Conflicts:
	.gitignore
	Gladiator.userprefs
gitignore