work on trade and trade history page
Merge branch 'master' of https://github.com/klossalex/walkingarchive-app