UI Updates
Merge branch 'master' of github.com:CMPUT301W14T12/GeoChan
Fixed issues with scrolling
Added saving into a thread with locking
Fixed file locking