Merge masterWORKING into samWORKING
WORKING VERSION 3 (Timeout bug persists) Connection in GUI displays correctly now
Commiting After Merge (REQUESTED BY GIT)