[#1273] resource upload with basic ui and mulitipart api uploading
[#1273] fix merge with org upload branch
[#1273] Make sure new resource upload works, also fixes #994
[#1273] Add javascript to resource uploads
[#1273] add size limits properly and add docs
[#1273] change template.ini and fix more docs
[#1273] change filestore docs
Merge branch 'master' into 1273-resource-uploads
[#1273] fix some tests
Merge branch '1273-resource-uploads' of github.com:okfn/ckan into 1273-resource-uploads
[#1273] fix some more tests
[#1273] pep8
[#1273] fix datastore test
[#1273] Removes old CSS for resource file type swtiching
Merge branch 'master' into 1273-resource-uploads

Conflicts:
	ckan/templates/group/snippets/group_form.html
	doc/filestore.rst
[#1273] fix typos and minor issues from pull request
[#1273] add filestore migration script
[#1273] fix some typos
Merge pull request #1273 from okfn/1273-resource-uploads

Resource uploads through multipart form data.