Update README.md
Merge branch 'master' of https://github.com/djyt/cannonball
Merge branch 'master' of https://github.com/djyt/cannonball
Corrected default scale
Fix for sound enable
Merge branch 'develop'

Conflicts:
	src/main/frontend/config.cpp
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Fixed FPS setting