no idea what I did in this
fixed conflicts
Merge branch 'develop' of github.com:blaavogn/bdsa into develop