Finishing up order process
Merge branch 'master' of https://github.com/UCDAAPIT/daapcamps

Conflicts:
	daapcamps/settings.py
	storage.db
Small Changes