Bumping the version numbers.
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into mybranch