Get latest changes from remote repository
Merge remote-tracking branch 'origin/master'

Conflicts:
	solaris/warbook/mech/views.py
Numerous fixes and tweaks
Refactoring: Move Equipment into a separate app
Allow omnimech fields to be blank on forms
Derive mech_key on load.
Re-do Warbook migration for mechs
Redeploy MechDetailView
Add fixes to Mech Bulk Import tool
Use case-insensitive lookups for Mech List and Mech Detail
URL fix for Mech Listing
Layout tidyup
Convert walking / running MP to an integer before returning
View logic and urls.py fixes
Add Basic Search view
Consolidate Forms Template
urls.py syntax fix
Implement a basic Mech Search form
Convert Importer to lxml
Add basic armor functions