upload zinzorgsheet fix teams and errors
Merge branch 'develop' of https://github.com/askcs/team-up-web into develop

Conflicts:
	app/scripts/config.js