Merging. End of Sprint 6
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/ComputingTimetablePlanner.apk
	bin/classes.dex
	bin/classes/com/example/computingtimetableplanner/FinaliseActivity.class
	bin/classes/com/example/computingtimetableplanner/SemesterActivity$1.class
	bin/classes/com/example/computingtimetableplanner/SemesterActivity$2.class
	bin/classes/com/example/computingtimetableplanner/SemesterActivity$3.class
	bin/classes/com/example/computingtimetableplanner/SemesterActivity$4.class
	bin/classes/com/example/computingtimetableplanner/SemesterActivity.class
	bin/classes/com/example/computingtimetableplanner/UnitActivity.class
	bin/dexedLibs/appcompat_v7-a7fb32688dc1b4164195715a05d1ce21.jar
	bin/resources.ap_
	src/com/example/computingtimetableplanner/SemesterActivity.java