tmp commit
Merge branch 'master' of https://github.com/paul-edouard/ExChange.git

Conflicts:
	com.munch.exchange/src/com/munch/exchange/parts/neuralnetwork/error/NeuralNetworkErrorPart.java