fix #43
Merge remote-tracking branch 'upstream/develop' into account-manager

Conflicts:
	src/main/java/org/cryptocoinpartners/module/Context.java
Initial position management via PortfolioManager