ms4 final
Merge remote-tracking branch 'origin/master'

Conflicts:
	MS3_v2/.gradle/2.1/taskArtifacts/cache.properties.lock
	MS3_v2/.gradle/2.1/taskArtifacts/fileHashes.bin
	MS3_v2/.gradle/2.1/taskArtifacts/fileSnapshots.bin
	MS3_v2/.gradle/2.1/taskArtifacts/outputFileStates.bin
	MS3_v2/.gradle/2.1/taskArtifacts/taskArtifacts.bin
	MS3_v2/.idea/workspace.xml
	MS3_v2/app/app.iml
	MS3_v2/build/intermediates/model_data.bin
	MS3_v2/local.properties
	MS4/.gradle/2.1/taskArtifacts/cache.properties.lock
	MS4/.idea/workspace.xml
	MS4/build/intermediates/model_data.bin