added ticket / addon prices on registration page
fixed merge conflict