add picture slider
Merge branch 'test' into user
fix events and resque
Merge branch 'user' into active_admin
events
Merge branch 'active_admin' into dev
view slider
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
change paginator style
application layout fixes
user modal div
Fix picture slider
pusher for pusher.com server
pusher comment fix
test parsing