Getting code from polux
Merge branch 'master' into staging

Conflicts:
	BetHunting/urls.py
	main/static/js/rebates.js
	main/templates/rebates.html
	main/views.py