Fixed some pre-release stuff and config file handling
Merge branch 'develop' into develop-mators11