Stuff
Merge remote-tracking branch 'origin/migs' into migs

Conflicts:
	refactored/ErrorAnalyser.pyc
	refactored/ModelDataBuilder.pyc
	refactored/neurolab_extension.pyc