Added support for gps option
Merge remote-tracking branch 'upstream/master'

Conflicts:
	appinfo.json