Merge branch 'master' into bugs
embed create new account page
don't change location if we're not actually going through with the event
link to transactions from marketplace selection page, reset marketplace when going page to marketplace selection page
format
Merge pull request #200 from balanced/bugs

Parity Bugs
checkpoint, marketplace management page
Merge branch 'master' into bugs
marketplace management page
add secret and type of customer on marketplace settings page
Merge remote-tracking branch 'origin/master' into search
Merge pull request #203 from balanced/bugs

Parity Bugs 2
Fixes #193.