Merge branch 'development' into livetest
Merge branch 'development' into livetest
Merge branch 'development' into livetest
Merge branch 'development' into livetest
fix db init
Improvements to html sanitizer
Merge branch 'livetest' into development