Merge branch 'hotfix_0.5.2'
Merge branch 'release_0.6.0'
fix: screencast under https
Merge branch 'hotfix_0.6.1'
Merge branch 'hotfix_0.6.2'
1.0.0
Bump version
Merge branch 'release_1.1.0'
Merge commit 'cfc47e618913b1db85cc08206f7ff08849fc9e29'

Conflicts:
	app/scripts/config.js
	app/scripts/controllers/upload.js
	dist/scripts/config.js
	dist/scripts/controllers/upload.js
	dist/styles/0b01482c.main.css
Update styling upload zinzorgsheet

Conflicts:
	dist/scripts/config.js
	dist/views/upload.html
Merge branch 'master' into develop

Conflicts:
	dist/index.html
	dist/scripts/config.js
Merge branch 'develop' of https://github.com/askcs/team-up-web into develop

Conflicts:
	dist/scripts/config.js
	dist/styles/caa07db1.main.css