training model updated
fix bugs in picker methods
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/dataStore/DataStore.java