[#1115] Changes name of parent header block
[#1114] Do not reuse the variable name as it leaks
[#1115] Change block names within child template and not parent as it could cause block extension issues
[#1120] Add check for datastore_make_public
[#1120] Tests for make_public added auth function
fix paster db clean
Merge branch '1114-fix-delete-vocab-tag'
Merge branch '1120-datastore-make-public'
Merge branch 'master' of github.com:okfn/ckan
Merge branch '1123-paster-db-clean-fix'

Conflicts:
	ckan/config/environment.py
Merge branch '1115-header-block-recursion'
Merge remote-tracking branch 'okfn/master' into 981-extend-datastore-create