import IntegrityError before trying to use it
Merge pull request #27 from Dennovin/upstream

import IntegrityError before trying to use it
Assets: fix assets_summary template issues due to Jingo changeover
Wallet Journal: fix errors caused by no 'Group by <time period>' option being selected by default
Assets: hopefully fix intermitten errors due to Django 1.5 stupidity
BPcalc: fix some view/template issues causing errors when trying to use certain blueprints
Blueprints: fix blueprints_import template issue due to Jingo changeover
Home: fix home template issue that shows up very occasionally
Tasks: hacky workaround for IndustryJobs missing some job state changes - any jobs where the jobID is no longer in the API result, end_time is 14+ days ago AND completed=0: mark as completed/delivered
Assets: really fix obscure random bug
Blueprints: really fix template error
Merge remote-tracking branch 'upstream/develop' into develop