Adds image/jpeg as allowed file type
Changes Coupon image url to include leading slash and adds coupon image path
Adds validation for user_id to merchant and edits the populate script to deal with this added validation
Adds new cap tasks for symlinking the coupon image folder
Changes run to execute in deploy.rb
Adds roles to new cap tasks
Updates README with recent changes and a few tips and tricks
Changes validation of coupon hidden
Removes cookie added by accident
Sets login to only return userid if there is no merchant attached
Destroys user session before creating a new user
Adds Access Control Request Method to CORS
Adds response to OPTIONS http verb for all methods
Merge pull request #59 from startuphokie/staging

Staging
Merge branch 'master' of github.com:startuphokie/bargainburg.backend into testing

Conflicts:
	app/models/coupon.rb