Merge branch 'hotfix/v1.1'
Fix config.php.example and install instructions.
Merge branch 'hotfix/v1.2' into develop