Commit 15/12

Commit 15/12
Merge remote-tracking branch 'origin/master'

Conflicts:
	Launcher11/.gradle/1.12/taskArtifacts/cache.properties.lock
	Launcher11/.gradle/1.12/taskArtifacts/fileHashes.bin
	Launcher11/.gradle/1.12/taskArtifacts/fileSnapshots.bin
	Launcher11/.gradle/1.12/taskArtifacts/outputFileStates.bin
	Launcher11/.gradle/1.12/taskArtifacts/taskArtifacts.bin
	Launcher11/.idea/workspace.xml

	Launcher11/app/build/generated/source/r/debug/com/android/Launcher1/R.java

	Launcher11/app/build/intermediates/incremental/mergeResources/debug/merger.xml
	Launcher11/app/build/intermediates/res/debug/layout/items.xml

	Launcher11/app/build/intermediates/res/debug/layout/route_search_screen.xml
	Launcher11/app/build/intermediates/res/debug/layout/stopalert.xml
	Launcher11/app/build/intermediates/res/debug/layout/video_screen.xml