Merge branch 'dev' into test&fix
fix foreign key
fix tests
fix active admin
fix cloud tag
Merge pull request #201 from SBS-team/test&fix

Test&fix