t
Merge remote-tracking branch 'origin/glsh'

Conflicts:
	.gitignore
	AndroidManifest.xml
	res/layout/fragment_main.xml
	res/values/strings.xml
	src/tk/tiabph/lvremote/MainActivity.java
Merge branch 'master' of https://github.com/tiabph/LVRemote