EPA115, 116, 117, 118
Merge remote-tracking branch 'origin/master'

Conflicts:

	bin/classes/com/example/computingtimetableplanner/SemesterActivity.class
	bin/classes/com/example/computingtimetableplanner/UnitActivity.class