* Updated manifest
 * Add Location Activity
 * Updated .gitignore
Merge branch 'master' into dev

Conflicts:
	.gitignore
	.gradle/1.8/taskArtifacts/fileHashes.bin
	.gradle/1.8/taskArtifacts/fileSnapshots.bin
	.gradle/1.8/taskArtifacts/outputFileStates.bin
	.gradle/1.8/taskArtifacts/taskArtifacts.bin
	.idea/workspace.xml
	GooglePlayServices/build/incremental/mergeResources/debug/outputs.data
	GooglePlayServices/build/incremental/mergeResources/release/outputs.data
	GooglePlayServices/build/incremental/packageResources/release/outputs.data
	GooglePlayServices/build/libs/GooglePlayServices-debug.ap_
	GooglePlayServices/build/libs/GooglePlayServices-release.ap_
	GooglePlayServices/build/libs/GooglePlayServices.aar
	local.properties