Fix untracked files
Merge https://github.com/mfoacs/WSPGO

Conflicts:
	WSPGO/settings.save
Design&Login