Merge branch 'release/0.5.7' into develop
Moved some configuration files to local directory.
Ready for version 0.5.8.
Merge branch 'release/0.5.8'