fix db col
Merge branch 'dev' into test&fix
fix file validation
Merge branch 'dev' into test&fix
fix active admin (upload file)
fix active admin
Merge pull request #190 from SBS-team/test&fix

Test&fix