EPA138
Merge remote-tracking branch 'origin/master'

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