Bump version number
Merge branch 'master' of https://github.com/munkireport/munkireport-php into bisd-development

# By Arjen van Bochoven (4) and Noel B. A (3)
# Via Arjen van Bochoven
* 'master' of https://github.com/munkireport/munkireport-php:
  Added ARD report
  Non-minified version of tabdrop
  Update configure.md
  fix AD displaying in DirectoryServices tab
  fixed widget bound to DS
  fixed displayed date in install history
  ard_model install script + indexes
Fix datetime in munkireport tab
Added four more vendors to display listing
Add sitename to login page
Added Compaq
Fix vendor
Compaq is now HP
Merge pull request #116 from nbalonso/displays-info

Added four more vendors to display listing
Added uptime to reportdata
Merge branch 'uptime' into wip
Add default value to uptime
If no uptime, list as unavailable
Small fixes for uptime()
Removed debugging code
Improved displays.py stability. Fixes #117
Merge pull request #118 from nbalonso/bug-fix

Improved displays.py stability. Fixes #117
Merge branch 'wip' of https://github.com/munkireport/munkireport-php into bisd-development

# By Arjen van Bochoven (10) and others
# Via Arjen van Bochoven (3) and Noel B. A (1)
* 'wip' of https://github.com/munkireport/munkireport-php:
  Improved displays.py stability. Fixes #117
  Removed debugging code
  Small fixes for uptime()
  If no uptime, list as unavailable
  Add default value to uptime
  Added uptime to reportdata
  Compaq is now HP
  Fix vendor
  Added Compaq
  Add sitename to login page
  Added four more vendors to display listing
  Fix datetime in munkireport tab
  Bump version number
Merge branch 'bisd-development' of https://github.com/BirdvilleISD/munkireport-php into bisd-current

# By Arjen van Bochoven (10) and others
# Via Arjen van Bochoven (3) and others
* 'bisd-development' of https://github.com/BirdvilleISD/munkireport-php:
  Improved displays.py stability. Fixes #117
  Removed debugging code
  Small fixes for uptime()
  If no uptime, list as unavailable
  Add default value to uptime
  Added uptime to reportdata
  Compaq is now HP
  Fix vendor
  Added Compaq
  Add sitename to login page
  Added four more vendors to display listing
  Fix datetime in munkireport tab
  Bump version number