sales
Merge branch 'master' of https://github.com/fadles/fadles

Conflicts:
	fadles/views.py