checkpoint, marketplace management page
Merge branch 'master' into bugs
marketplace management page
add secret and type of customer on marketplace settings page
Merge pull request #203 from balanced/bugs

Parity Bugs 2