Added classifier upload fix
Merge commit 'fcccea3555dc3fe90ea86e9133036ea88cf0fd97' into feature/Quex

Conflicts:
	public/app/controller/Classifier.js