Merge branch 'develop' of github.com:casastorta/software_versions into develop
Made space for MySQL optional