Squashed upload-api and download-excel into one new branch
Merge branch 'master' into pr/462
add minor modifications to sravan's fixture download/uploadAPI PR
Merge pull request #488 from dimagi/pr/462

resubmitting Sravan's upload-api and download-excel pull request