Adding local changes
Merge branch 'develop' of https://github.com/abrandemuehl/LeagueTeams into develop

Conflicts:
	nodejs/node_modules/node-celery
	teams/static/teams/js/home.js