clear file upload list on catevory change, start work on metadata panel
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/deployment.xml