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

Conflicts:
	stockfight/bets/tests.py
	stockfight/db.sqlite3
	stockfight/stockfight/settings.py