Merge remote-tracking branch 'origin/release-v2.0.1' into canada-v2.0

Conflicts:
	ckan/logic/action/update.py
after login redirect to dataset search not user page