tidy up
Merge origin/master

Conflicts:
	CRBM/src/crbm/Trainer.java