added conversions, conv/click, ctr, and required tests
Merge pull request #25 from HemangPatel1/master

added conversions, conv/click, ctr, and required tests
fixed james issue for min time validation, fixed business in offer test bug
new offer link on dashboard, changed see offer link to time window and put buy button into it
Merge pull request #26 from HemangPatel1/master

fixed james issue for min time validation, fixed business in offer test ...
Fixed offers having business in cucumber tests
Merge branch 'master' of https://github.com/RhysStansfield/deal into develop

Merging in updates to Business Dashboard from Hemang
removed create offer link from offers feed
Merging in updates - AngularJS fix and rspec fixes
Merge branch 'master' of https://github.com/RhysStansfield/deal

pulled upstream
removed ugly facebook connect button
changed bg color
Merge pull request #27 from HemangPatel1/master

removed create offer link from offers feed
Merge branch 'master' of https://github.com/RhysStansfield/deal into develop
Fixed factory girl issues
Fixing cucumber tests to work with updated business UI flow