Merge branch 'master' of github.com:imshah/TSKonnect into ishah_branch
adding in place editing capabilities
Merge branch 'ishah_branch' of github.com:imshah/TSKonnect into ishah_branch