Merge branch 'DEAL-016' of https://github.com/lauralb/dealhunter into DEAL-016

Conflicts:
	.idea/workspace.xml
Merge branch 'DEAL-015' of https://github.com/lauralb/dealhunter into DEAL-015

Conflicts:
	.idea/.generators
	.idea/.rakeTasks
	.idea/dataSources.ids
	.idea/dataSources.xml
	.idea/dealhunter.iml
	.idea/misc.xml
	.idea/runConfigurations/Development__dealhunter.xml
	.idea/workspace.xml
task mails winner/looser
Fix Conflicts