Integrated other features and project modularity into existing sources
Merge branch 'master' of https://github.com/Melanion/Caliber

Conflicts:
	caliber/urls.py
	vending/views.py