Merge branch 'release/v1.0'
Merge branch 'release/v2.0'
Fixed bug: include menu.php in display-name.php
Merge branch 'hotfix/HF#001' into develop