Merge origin/Dev into devalex

V1.0 gsb source code 
Conflicts:
	README.md