ssht
Merge branch 'master' of https://github.com/worami/BITBV

Conflicts:
	src/backend/PlanningCalculator.java