FR 1.4: Security Fix
Merge commit '3f1e812e167299c1cc1a9131892b3e75cbdbed34'
Dependencies for Metrics plugin
Merge commit 'ebb392b999761232ecbe797a77621257660c5c0a' into Dev2
Merge branch 'Dev2'
Merge pull request #89 from MPieter/master

FR 1.4: Security Fix
Merge branch 'CalZoneMaster' into MyMaster