test start
 add file for models test
Merge branch 'test' into user
fix events and resque
Merge branch 'user' into active_admin