Moved JQueryUI from file upload to master
Merge branch 'master' of https://github.com/enwida/idpRepo

Conflicts:
	workspace/enwida/src/main/webapp/WEB-INF/views/user/upload.jsp
Merge branch 'master' of https://github.com/enwida/idpRepo