Unroselved mergeconflict
Merge branch 'develop' of github.com:blaavogn/bdsa into develop