Merge branch 'dev' into active_admin
comment small fixes
Merge branch 'user' into dev
Merge branch 'images' into dev
Merge branch 'dev' into active_admin
merge user in to active_admin
test start
 add file for models test
Merge branch 'test' into user