Merge branch 'dev' into feature_addBookmark
Git testing

figuring out merging in the UI
Merge branch 'feature_addBookmark' into dev