Corrected isuse
Merge branch 'BETA' of https://github.com/uc-pkm/testing.git into BETA

Conflicts:
	index.php