f
Merge branch 'master' of https://github.com/awersatos/GS

Conflicts:
	GS-1/Debug/Obj/GS-1.pbd
	GS-1/Debug/Obj/GS-1.pbd.browse
	GS-1/GS-1.dep
	GS-1/GSM.c
	GS-1/settings/GS-1.wsdt