BOS adaptions
Merge branch 'master' of https://github.com/69GIAP/69GIAPBosWar

Conflicts:
	Website/functions/importPoints.php