hooked up team-activity mostly with socketio
Merge branch 'development' of github.com:TeamFit/web-app into development