Ops admin  bump
Merge branch 'master' of github.com:SanomaCZ/django-stock

Conflicts:
	stock/admin.py