Derive tables from correct base class to enable customizations
Introduce a customizable caption with the number of rows in it
Show number of categories in table caption
Merge branch 'get-model-problem-workaround' into machtfit

* branch get-model-problem-workaround:
  This is the real fix. Hopefully.
  Just log that for now until we figure this out.

https://github.com/tangentlabs/django-oscar/issues/1205
Merge branch 'django-tables2' into machtfit

* branch django-tables2:
  Show number of categories in table caption
  Introduce a customizable caption with the number of rows in it
  Derive tables from correct base class to enable customizations
  Move queryset_{description,icon} to Table class
  Move users list to django-tables2
  Remove pointless num_orders template tag
  TODO
  Allow table icon customization
  Move dashboard categories list to django-tables2
  Move table caption into <table><caption>
  Keep current tab and ordering when returning to the list after editing
  Move the dashboard product list to django-tables2

https://github.com/tangentlabs/django-oscar/pull/1173
Merge branch 'offer-improvements' into machtfit

* branch offer-improvements:
  The code handles the no applicable lines case well without this statement
  Make Benefit classes more reusable
  Don't break sentence spelling/grammar in German.
  Allow specifying other model attributes when creating custom benefits or conditions

https://github.com/tangentlabs/django-oscar/pull/1392
Merge branch 'refactor-offers' into machtfit

* branch refactor-offers:
  Fix typo
  Allow access to all non-voucher offers in offers dashboard
  Apply offers in order of descending priority
  Support multiple benefits per line
  Refactor offers
  Don't create objects in the database unless necessary
  Remove conditions and benefits
  applies_to_tax_exclusive_prices has been removed in f03a7e8
  The code handles the no applicable lines case well without this statement
  Make Benefit classes more reusable
  Don't break sentence spelling/grammar in German.
  Allow specifying other model attributes when creating custom benefits or conditions

https://github.com/tangentlabs/django-oscar/pull/1414

Conflicts:
	oscar/apps/offer/models.py
Merge branch 'title-fix' into machtfit

* branch title-fix:
  This was forgotten in d3ddfa5

https://github.com/tangentlabs/django-oscar/pull/1421
Merge branch 'checkout-refactor' into machtfit

* branch checkout-refactor:
  WIP Refactor checkout
  Remove commented code

https://github.com/tangentlabs/django-oscar/pull/1423
Merge branch 'fix-fork-apps' into machtfit

* branch fix-fork-apps:
  Add missing newlines
  Fix deprecation warning
  Fix oversight

https://github.com/tangentlabs/django-oscar/pull/1428
Merge branch 'rework-order-comm' into machtfit

* branch rework-order-comm:
  Rework order emails.
  Don't create CommunicationEvent here

https://github.com/tangentlabs/django-oscar/pull/1437
Merge branch 'payment-tweaks' into machtfit

* branch payment-tweaks:
  Allow access to the created events for custom order processing
  Clarify which payment events the method permits.

https://github.com/tangentlabs/django-oscar/pull/1444
Merge branch 'dashboard-user-search' into machtfit

* branch dashboard-user-search:
  Use FormMixin to keep familiar Django APIs available
  Allow for easier search form customization

https://github.com/tangentlabs/django-oscar/pull/1446

Conflicts:
	oscar/apps/dashboard/users/views.py
Merge branch 'l10n-formats' into machtfit

* branch l10n-formats:
  Pass correct format to JS widget

https://github.com/tangentlabs/django-oscar/pull/1455
Merge branch 'datetimepickers' into machtfit

* branch datetimepickers:
  Remove duplicate ifs
  Add a component time picker widget
  Component for datetime and date widgets
  Set correct language for datetime picker
  Concatenate into one JS file and load translations for datetime picker
  Display time in user- or locale-defined format in timepicker
  Replace timepicker with the time part of the datetime picker
  Replace datepicker with the date part of the datetime picker
  Replace datetimepicker
  Replace timepicker

https://github.com/tangentlabs/django-oscar/pull/1457
Merge branch 'inputmask' into machtfit

* branch inputmask:
  Use inputmask for date and time widgets
  Add the brilliant jquery.inputmask
  Extract mixin
  Fix typo

https://github.com/tangentlabs/django-oscar/pull/1476
Merge branch 'phonenumbermixin' into machtfit

* branch phonenumbermixin:
  Allow customizing the logic to get the country for hinting

https://github.com/tangentlabs/django-oscar/pull/1458
Merge branch 'select2-bootstrap-style' into machtfit

* branch select2-bootstrap-style:
  Add bootstrap style for select2

https://github.com/tangentlabs/django-oscar/pull/1465

Conflicts:
	oscar/templates/oscar/dashboard/layout.html
Merge branch 'css-changes' into machtfit

* branch css-changes:
  Undo this bootstrap modification. It makes things harder to read.
  Add CSS to vertically align plain text with the label in a horizontal form
  Undo border color changes that didn't catch all borders
  Reduce whitespace above black bar at the bottom and the form above
  Remove deviations from stock bootstrap that caused problems
  Use more down-to-earth z-index.
  Don't mess with my CSS like this!
  Visually connect tabs with tab content through a well
  Set a bigger font size and more readable font
  Actually use the variables from variables.less
  Remove unused CSS
  Bigger font for inputs
  Leave non-wysiwyg text areas alone
  Use bootstrap button color instead of the same color for all button types
  Don't overwrite bootstrap error, success and information alert colors
  Update less to 1.7.3 and enable source maps
Bump version.