Only app related code.
no message
Merge branch 'Nitin_Local' into yifei

* Nitin_Local:
  Only app related code.

Conflicts:
	.gradle/1.12/taskArtifacts/cache.properties
	.gradle/1.12/taskArtifacts/cache.properties.lock
	.gradle/1.12/taskArtifacts/fileHashes.bin
	.gradle/1.12/taskArtifacts/fileSnapshots.bin
	.gradle/1.12/taskArtifacts/outputFileStates.bin
	.gradle/1.12/taskArtifacts/taskArtifacts.bin
	.idea/misc.xml
	.idea/vcs.xml
	.idea/workspace.xml
	RockPaperScissor.iml
	build/intermediates/dex-cache/cache.xml