Rename sb_biz app to main.
Merge branch 'develop'
Merge branch 'master' of https://github.com/seanbradley/Dreamworld
Merge branch 'develop'
Incl. updated Apache config file.
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Fix import in cities/admin.py.
Simplify unicode def in models; add some comments.
Clean up cities/urls.py.
Refactor view_two to display form and use cleaned_data.
Initial tweaks for using celery.
Overhaul templates; fix redundant links in sidebar.
Clean up base urls.py.
Incl. cities/forms.py.
Moved Boostrap files in site-styles.