Merge branch 'dev' into feature_addBookmark
git testing

more testing
Merge branch 'feature_addBookmark' into dev