test project
Merge branch 'master' of bitbucket.org:Melanie1000/google-glass

Conflicts:
	.project
	AndroidManifest.xml
	bin/AndroidManifest.xml
	project.properties
	res/layout/card_text.xml
	res/values/strings.xml
	res/values/styles.xml
	res/xml/voice_trigger.xml