unirea
Merge branch 'master' of https://github.com/alexcazacu/stockfight

Conflicts:
	stockfight/bets/models.py
	stockfight/db.sqlite3
	stockfight/quotes/base.py
	stockfight/quotes/quotes_pipeline.py
	stockfight/stockfight/settings.py