[#398] Fix delete org
[264] Fix 500 on password reset
[#493] Fix schema so we can change private via web interface
Merge branch 'master' into 493-schema-fix
Merge branch 'master' into 398-delete-org-fix
[#493] Fix check_data_dict()
[#494] Fix deleting datasets of org
[#494] Better flash message for delete org
Merge branch '398-delete-org-fix'
Merge branch 'master' of github.com:okfn/ckan into 493-schema-fix
Merge branch '493-schema-fix'
Merge branch '494-org-500-take2'

Conflicts:
	ckan/logic/action/delete.py
Merge branch 'master' of github.com:okfn/ckan
[#496] ensure we have the full package data
[#496] Fix the schema for editing dataset
[#496] Fix owner_org_validator() error messages
Merge branch '496-edit-dataset-problems'
Adds options to autocomplete module for mapping key/value pairs

The autocomplete module now has `data-module-key` and `data-module-label`
options which map on the JSON response like this. Example JSON AJAX response:

  [
    { "a": 1, "b": 2, "c": 3 },
    { "a": 4, "b": 5, "c": 6 }
  ]

So, let's say the input needs to have `a` as a value but wants to use `c` as
a label within the dropdown.

Therefore: `data-module-key="a" data-module-value="c"`

:boom:
Fixes dataset edit template and adds options for key/value pairs in autocomplete
Merge pull request #264 from okfn/264-fix-500-on-password-reset

500 server error on password reset