Blargh
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/ComputingTimetablePlanner.apk
	bin/classes.dex
	bin/classes/android/support/v7/appcompat/R$layout.class
	bin/classes/com/example/computingtimetableplanner/MainActivity.class
	bin/classes/com/example/computingtimetableplanner/R$id.class
	bin/classes/com/example/computingtimetableplanner/R$layout.class
	bin/classes/com/example/computingtimetableplanner/R$menu.class
	bin/classes/com/example/computingtimetableplanner/R$string.class
	bin/classes/com/example/computingtimetableplanner/R$style.class
	bin/classes/com/example/computingtimetableplanner/R$styleable.class

	bin/classes/com/example/computingtimetableplanner/SemesterActivity.class
	bin/classes/com/example/computingtimetableplanner/StreamActivity.class
	bin/classes/com/example/computingtimetableplanner/UnitActivity.class
	bin/resources.ap_