stuff
Merge branch 'master' of https://github.com/grid32/ComputingTimetablePlanner

Conflicts:
	bin/ComputingTimetablePlanner.apk
	bin/classes.dex