Changes.
Merge branch 'master' of github.com:rockwolf/lisa

Conflicts:
	lisa/modules/trade.py