upload
Merge branch 'master' of https://jiongs@github.com/jiongs/cocit.git

Conflicts:
	web/jCocit-src/js/jCocit.ui.upload.js