Trade service working
Merge branch 'master' of https://github.com/thagberg/currency

Conflicts:
	sim/views.py