Merge remote-tracking branch 'origin/RolandintoAndroidStudio' into RolandintoAndroidStudio

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

	SIDM_20141/app/build/intermediates/incremental/mergeAssets/debug/merger.xml

	SIDM_20141/app/build/intermediates/incremental/mergeAssets/test/debug/merger.xml

	SIDM_20141/app/build/intermediates/incremental/mergeResources/debug/merger.xml

	SIDM_20141/app/build/intermediates/incremental/mergeResources/test/debug/merger.xml
	SIDM_20141/app/build/intermediates/res/debug/layout/helppage.xml
	SIDM_20141/app/build/intermediates/res/debug/layout/mainmenu.xml
	SIDM_20141/app/build/intermediates/res/debug/layout/optionpage.xml
	SIDM_20141/app/build/intermediates/res/debug/layout/splashpage.xml
	SIDM_20141/app/build/intermediates/res/debug/menu/main_menu.xml
	SIDM_20141/app/build/intermediates/res/debug/values-v11/values.xml
	SIDM_20141/app/build/intermediates/res/debug/values-v14/values.xml

	SIDM_20141/app/build/intermediates/res/debug/values-w820dp-v13/values.xml
	SIDM_20141/app/build/intermediates/res/debug/values/values.xml
	SIDM_20141/app/build/intermediates/res/resources-debug-test.ap_
	SIDM_20141/app/build/intermediates/res/resources-debug.ap_
	SIDM_20141/build/intermediates/model_data.bin