Merge branch 'hotfix/fix_config_in_readme' into develop
Merge branch 'hotfix/fix_typo_again' into develop
Merge branch 'master' of github.com:marcus-herrmann/FlagPages into develop