Merge branch 'dev' into active_admin
Merge branch 'dev' into active_admin
resque & mailer
fix category
fix mailer & models & views
Merge branch 'test' into user
fixes mailer
add event
fix event & add navigation
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