s
Merge branch 'ap' of github.com:zdimon/pshop into ap

Conflicts:
	celerybeat-schedule
currency