#183: merged in Vicki's change to the main repo and also made static pages rendered as templates
Merge branch 'master' of https://github.com/EliAndrewC/magfest into develop

Conflicts:
	uber/templates/emails/precon_faqs.html
	uber/templates/preregistration/badge_choice.html
	uber/templates/preregistration/form.html
	uber/templates/preregistration/index.html
	uber/templates/preregistration/register_group_member.html
	uber/templates/preregistration/transfer_badge.html
	uber/templates/signups/possible.html
	uber/templates/signups/taken.html
	uber/templates/static_views/privacy.html
	uber/templates/summary/food_restrictions.html

Signed-off-by: Victoria <kitsuta@gmail.com>