updated test.html to 4
updated test to 5
Merge branch 'feature/logout' into develop
no message
Merge branch 'release/1.0'