Merge branch 'master' of https://github.com/Strobocop/google-glass-hello-world
Merge branch 'master' of https://github.com/Strobocop/google-glass-hello-world

Conflicts:
	.idea/workspace.xml
	AndroidManifest.xml
	res/values/strings.xml