prepped the UI a bit, more progress on the teamtools api
Pulling WIP into master
Merge branch 'develop'