location detect
Merge branch 'master' of https://github.com/duongvc/apps

Conflicts:
	02_code/Gate365/src/com/travel/gate365/service/GPSWrapper.java