Merge branch '10.5-fix'
Bump patch version
Added some vendors
Merge branch 'wip' of https://github.com/munkireport/munkireport-php into wip
Added another display vendor

Well actually it's a beamer..
Fix ARD preference path
Some pylint cleanups
Move postflight.d run to beginning of postflight
Added internet plugin reporting
Added two more display vendors
Add authorization for delete_machine
Merge branch 'authorisation' into wip
Fix sorting on installhistory

Fixes #168
Merge branch 'master' into wip

Conflicts:
	app/helpers/site_helper.php
Bump minor to 2
Update changelog
Revert "Wip"
WIP 141111

WIP 141111