Patched the migrations and wagtailusers app to add better support for custom AUTH_USER_MODEL
Merge branch 'master' of https://github.com/v1kku/wagtail into v1kku-master

Conflicts:
	wagtail/wagtailusers/views/users.py
Add clarifying comment to the change_user_perm line
changelog/contributors update