Merge branch 'develop' of /home/luh130/share/projects/github/certnanny/CertNanny/ into develop
* merged with Arkadius
Merge branch 'develop' of Z:/Peter/CertNanny/ into HEAD

Conflicts:
	agent/lib/perl/CertNanny.pm
* merge
Merge branch 'develop' of file:///Z:\Peter\CertNanny\.git into develop
* MERGE