Updated for XE16.
Merge branch 'master' of https://github.com/justindriggers/Glass-Launcher

Conflicts:
	AndroidManifest.xml
	src/com/jtxdriggers/android/glass/glasslauncher/GlassLauncherService.java