nc
Merge branch 'master' of https://github.com/duyhtq/DHHelloGlass

Conflicts:
	bin/classes/com/example/dhhelloglass/HelloService.class
	bin/classes/com/example/dhhelloglass/MainActivity.class
	res/values/strings.xml
	src/com/example/dhhelloglass/HelloService.java
	src/com/example/dhhelloglass/MainActivity.java