burrnnn
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	Documents/Scrum documents/Burndown chart.ods
Merge branch 'develop' of https://github.com/blaavogn/bdsa into develop