Pulling latest updates
Merge branch 'master' of https://github.com/RhysStansfield/deal
Merge branch 'master' of https://github.com/RhysStansfield/deal
Fixed follow and impression tests
Merge branch 'master' of https://github.com/RhysStansfield/deal
sign up error redirect
Merge branch 'master' of https://github.com/RhysStansfield/deal

:wq
:wq

:wq
:wq
fixed category filtering for customer preferences
Work on business dashboard stats
Merge pull request #48 from MBottjer/master

fixed category filtering for customer preferences
Side slide out for preferences and updated Seeds.rb
Ajaxified offers page for customers
Merge in further CSSing and JS from Hemang
Merging in changes from Nadia
More AJAX fixes
added ave time between click and conversion
Merging in updates from James JenkinsYates
Merging in further CSS updates from Hemang
Merge branch 'master' of https://github.com/RhysStansfield/deal
merged with master branch
added dropdown for signout