updated upload api
Merge branch 'master' of https://github.com/Alfresco/ThunderOps

Conflicts:
	app/routes/api.py