document interactive command line option
only do innoDB upgrade if interactive
use fully specified version
update Depends to match ubuntu.
Include monitor name in log otput so we know which monitor we are talking about. This informaton is not included when the error occurs in zms.
Merge branch 'master' into zmupdatefixes

Conflicts:
	scripts/zmupdate.pl.in
Merge branch 'master' into controlversionfixes
fix putting the mode back. I merged it to the wrong place
Merge pull request #584 from ZoneMinder/zmupdatefixes

Zmupdatefixes
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into bootstrap-skin
Add function for returning system load via api
Grab system load from API and set with angular
Tell cmake to configure zm version and config path in cakephp