Merge branch 'master' of https://github.com/grid32/ComputingTimetablePlanner

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/ComputingTimetablePlanner.apk
	bin/R.txt
	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$integer.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/Stream.class
	bin/resources.ap_
	gen/android/support/v7/appcompat/R.java
	gen/com/example/computingtimetableplanner/R.java
	res/layout/activity_main.xml
	res/values/strings.xml
	src/com/example/computingtimetableplanner/MainActivity.java
	src/com/example/computingtimetableplanner/Stream.java
g
yeh