Extend help text for promotion models
Add more links to promotions dashboard templates
Check for txSlider existance before trying to use it

The dashboard templates don't load it so the old code raises an error.
Ignore verify_exists for local URL validation

There's no security issue with checking local URLs.
Serve (full) jQuery UI form CDN

The customised version didn't have sorting which is required for the
promotions dashboard.  We use the full file from a CDN.
Merge pull request #953 from tangentlabs/feature/multiimage

Enable Multi-Image content block
Allow taxes to be shown separately in thank-you template
Adjust translation function for offer app

Thanks @madEng84

Fixes #958
Docs: Always rebuild all docs

Previously, only calling "make clean && make html" would display all
errors and warnings in the docs. This was too slow to do by default, and
hence many errors would go unnoticed.
Adding the -a flag to Sphinx forces it to look at all the files again,
but is considerably quicker than deleting the build directory. As such,
I think it's good default behaviour as it isn't too slow even on
non-SSD machines.
More permissive handling of access to orders

To be more consistent with how access to products is handled in the
permission based dashboard, access to orders is now more permissive. As
long as one order line's partner has the current user in it's users,
access is granted.
Enable dashboard's IndexView for permission-based dashboard

The only change is that it checks for a 'index_nonstaff.html' template
first before using the standard index.html which displays potentially
sensitive store statistics.
Rename to is_user_a_partner_user

Naming things is hard, and @codeinthehole had a better suggestion.
Add docs for permission-based dashboard
Remove unused imports and add one needed one

Ran through the codebase with pyflakes. It caught one missing
ImproperlyConfigured import.
Merge branch 'master' into feature/permission-dashboard

Conflicts:
	oscar/apps/dashboard/catalogue/views.py
	oscar/apps/dashboard/offers/views.py
	oscar/apps/dashboard/orders/views.py
Merge pull request #732 from tangentlabs/feature/permission-dashboard

Adds support for the permission-based dashboard
Update Django versions for Tox and Django

Both Django 1.4 and 1.5 have been updated.
Bump oscar-stores requirement
Ensure thawed baskets get a strategy assigned
Add tests for PhoneNumberField