update

updateing
Merge branch 'master' of https://github.com/Tiritium/Tektiles

Conflicts:
	webstore/urls.py
	webstore/views.py