Merge branch 'production' into develop
less stuff in info.txt
Merge branch 'develop' into production
changed things in info.txt