Training panel functionality
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/wxGUI.py