Update register.html.haml
Update register.html.haml
Update register.html.haml
Update conference extension
Fix production vs. master merge conflict
Merge branch 'master' into production
Update conference extension
Update conference extension
Choose CSV lib depending on ruby version
Change price for book
Merge branch 'Dean' of github.com:nzffa/nzffa into dean
Remove marketplace ...
... and re-add it as a gem