update
update
Merge branch 'master' of https://github.com/SimplyTapp/GpjShellBridge

Conflicts:
	build/libs/STBridge.jar