Server runs

created inventory urls index function
Merge branch 'dev2' of meiri to dev3

Conflicts:
	swatbarter/customer/urls.pyc
	swatbarter/customer/views.py
	swatbarter/customer/views.pyc
	swatbarter/inventory/models.pyc