Some more initial setup
Weekend work
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/Views/AppView.js
	public/js/Views/TeamView.js