Fixed bug with amount_extra. Cleaned up jQuery for badge_choice.html

Signed-off-by: Victoria <kitsuta@gmail.com>
Merge branch 'develop' of https://github.com/kitsuta/magfest into develop

Conflicts:
	uber/templates/preregistration/badge_choice.html