Feest
Merge remote-tracking branch 'origin/master'

Conflicts:
	CompendaServer/Server_Compenda.php
Feest
Merge remote-tracking branch 'origin/master'