Updated Modals for Companion and Shop
Merge branch 'master' of https://github.com/Tiritium/Tektiles

Conflicts:
blog/__init__.pyc
blog/admin.pyc
blog/models.pyc
blog/urls.pyc
blog/views.pyc
companion/__init__.pyc
companion/admin.pyc
companion/models.pyc
companion/urls.pyc
companion/views.pyc
frontend/__init__.pyc
frontend/admin.pyc
frontend/models.pyc
frontend/urls.pyc
frontend/views.pyc
login/__init__.pyc
login/admin.pyc
login/forms.pyc
login/loginRouter.pyc
login/models.pyc
login/urls.pyc
login/views.pyc
mysite/__init__.pyc
mysite/settings.pyc
mysite/urls.pyc
mysite/wsgi.pyc
userdb.sqlite3
webstore/__init__.pyc
webstore/admin.pyc
webstore/bing_search.pyc
webstore/models.pyc
webstore/search_indexes.pyc
webstore/urls.pyc
webstore/views.pyc
I hate you .pyc