horizontal form template added
Merge remote-tracking branch 'origin/master'

Conflicts:
	nikbad/urls.py
	sales/views.py