fgfg
Merge branch 'master' of https://github.com/miccerisier/gps

Conflicts:
	app1_Editor/project/gps-editor.pro.user