Merge remote-tracking branch 'origin/master'

Conflicts:
	.gradle/2.0/taskArtifacts/cache.properties.lock
	.gradle/2.0/taskArtifacts/fileHashes.bin
	.gradle/2.0/taskArtifacts/fileSnapshots.bin
	.gradle/2.0/taskArtifacts/outputFileStates.bin
	.gradle/2.0/taskArtifacts/taskArtifacts.bin
	.gradle/gradle.log

Added TechPlus Folder

Added TechPlus Folder with source and assets.