sync

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

Conflicts:
	companion/models.pyc
	userdb.sqlite3
	webstore/views.pyc