Patched the migrations and wagtailusers app to add better support for custom AUTH_USER_MODEL
Added template tag slugurl

Added a new tag that returns a page URL according to the page slug.
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
Fall back on username in moderation panel if full name not defined
Merge branch 'master' of https://github.com/jmiguelv/wagtail into jmiguelv-master
Add missing Page import
add tests for pageurl / slugurl
return None rather than '#' when no match found by slugurl
changelog / contributors update for #166
only show wagtailuserbar if page.id is defined - prevents error when previewing during page creation
gs
Removed trailing spaces from wagtailadmin scss files
Merge branch 'master' of github.com:balazs-endresz/wagtail
Removed trailing spaces from wagtailadmin js files
Remove redundant parameters from wagtailuserbar tag; trigger a DeprecationWarning if people are still passing a css path
Refactor wagtailuserbar logic - no need to split it between templatetags and views
Merge branch 'master' of github.com:torchbox/wagtail
Added collapsible multi-field panels