Merge branch 'dev' into test&fix
models code refactor
views code fix
test code fix
fix gemfile
Merge pull request #226 from SBS-team/test&fix

Test&fix