This was left over when bootstrap-wysihtml5 was removed.
Merge pull request #963 from mbertheau/remove-rest-of-bootstrap-wysihtml5

This was left over when bootstrap-wysihtml5 was removed.
Docs: Move 'deploying' and 'upgrading' to topics/

Those documents lived in ref/, but really aren't reference documents.
Topics/ is a more appropriate place for them.
Adjust error messages that refer to a country

We add the definite article 'the' to the country names that start
'United' so that error messages read better.

Fixes #920
Docs: Updates for dynamically loaded applications

The customisation section required some changes as it's not often
necessary to override the root application instance to change URLs or
views of subapps.
Display non field errors in dashboard for stock records

On this form errors are raised globally and not by individual field.
This commit adds a errors line in the form table. It needs to be added
extra styling to this form.

Fixes #955
Fixes #918
Add "dashboard/base.html" which extends "base.html"

This adds more flexibiltiy to override the default base.html while 
keeping the oscar base.html for the dashboard.

This  can be done by overriding "dashboard/base.html" and then extend
"oscar/base.html" instead of "base.html"
Add additional template block for stock record section

Affects the dashboard product update template.

Fixes #966
Merge pull request #965 from LUKKIEN/feature/dashboard-template

Add "dashboard/base.html" which extends "base.html"
Support icons and namespaced URLs in dashboard nav again

Fixes #967
Travis: Fix migrations and ensure failing

* Use correct username for MySQL on Travis
  Travis docs say username should be 'travis', not 'root'.

* Fail test_migrations.sh if any command fails
  Previously, a failing (non-zero exit code) command would not lead to
  a non-zero exit code of test_migrations.sh. That meant that failing
  migrations would not fail the Travis job as intended.
Bump rosetta version to support Django 1.5
Correct consume_items call for sandbox offer
Ensure basket lines have a strategy instance in formset

This change ensures that each basket line instance has a strategy set
for the BasketLineFormSet.  This means you can access the price and
availability properties of the line.

Fixes #961
merging
Only allow addresse in valid ship-to countries to be shown at checkout

Before this a user could create an address in their account that isn't
in a shipping country, and it would still be available to ship to in the
checkout.  This changes ensures that only countries that are marked for
shipping can be selected at checkout.
Adjust address list view for clarity
Handle non-namespaced URL names in dashboard nav

This completes the change in #967 and ensures that Oscar sites can use
non-namespaced URLs in the dashboard.
Upgrade datacash extension for demo site
Ajax selects for dashboard's product fields

This should greatly increase usability of the dashboard product update
page when managing a large amount of products.

Fixes #618

Conflicts:
	oscar/apps/dashboard/catalogue/forms.py
	oscar/apps/dashboard/catalogue/views.py
	oscar/static/oscar/js/oscar/dashboard.js
	oscar/views/generic.py

Widgets for product selection using select2 and ajax