Merge branch 'twoln-dev' into 'master'

composer.json

database/edugain_schema.sql

edugain.config/admin_template.php

edugain.config/database_policy_template.php

edugain.config/database_ro_template.php

edugain.config/database_rw_template.php

external_scripts/dbhost/cert.py

lib/API.php

lib/Map_source/worldHigh.svg

lib/config-template.php

lib/eduGAIN_entity.php

lib/eduGAIN_manage.php

lib/eduGAIN_manage_gui.php

lib/eduTeams.php

lib/localAuth.php

lib/validatorClass.php

page-logic/authenticate.php

page-logic/manage.php

page-logic/otp_code.php

page-logic/otp_start.php