Merge branch 'dev' into active_admin
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
fix events and resque
Merge branch 'user' into active_admin
events
Merge branch 'active_admin' into dev
resque fix NavigationEvent saving
add captcha on sign up
fix user events
Merge branch 'user' into dev
Merge branch 'active_admin' into dev
merge dev into images