Merge branch 'hotfix/fix_timeout' into develop
fix bugs on feature3
implement feature4
tweak css
Merge branch 'feature/feature4' into develop
Merge branch 'release/v1'