prepared server routing and controllers for expanding team and user editing
Merge branch 'master' of http://github.com/benjaminjnoack/simian

Conflicts:
	client/views/partials/teamList.html