url change

Added urls for inventory and updated SwatBarter's urls for inventory
committing migrations because git wants me to??

also added template directory to settings.py
updated inventory models
Added admin for products
trying to get products to list but running into weird default value
errors
made some new views customer
conclude merge from conflicts with David
conclude merge, before migrations
Merge branch 'dev2' of https://github.com/meirianto/swatbarter into dev2
Revert 17c7375..0f07abe

This rolls back to commit 17c7375f15258cc24d20a7aaa24597debd99ad70.
Merge branch 'dev2' of https://github.com/meirianto/swatbarter into dev2

Conflicts:
	swatbarter/customer/views.pyc
	swatbarter/inventory/admin.pyc
	swatbarter/swatbarter/settings.pyc
	swatbarter/swatbarter/urls.pyc
Revert 17c7375..43d3203

This rolls back to commit 17c7375f15258cc24d20a7aaa24597debd99ad70.
conclude merge
removed *.pyc files from tracking
made HTML files for customer
fixed some errors in html...now createAccount and index work
Merge remote-tracking branch 'origin/dev2' into dev2
added viewaccount
tweked viewaccount