Finished work Monday - Brackets still broken.
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/ComputingTimetablePlanner.apk
	bin/classes.dex
	bin/classes/com/example/computingtimetableplanner/NewPlan.class
	bin/classes/com/example/computingtimetableplanner/StreamActivity.class
	bin/resources.ap_