bring back the secret when required
add escrow header on all activity pages
Merge commit '9ebd3e6ee7ca4f08df0120920405dd7d62ffc114'
Merge branch 'master' into bugs
dependency
better csrf implementation
Merge pull request #245 from balanced/bugs

Add marketplace secret back in to page
reset search type
fixes 251
fix failing test
Merge pull request #253 from balanced/bugs

fixes 251
Fixes #99