smal fixes in market, now using csrf token
Merge remote branch 'origin/develop' into develop