fix android build
Merge pull request #1 from Space-dog/3.1-hotfix

fix android build
atlases loading fix
ProgressTimer fix
additional scale fix
Android template fix
Cocos Builder fixes
Button - > ButtonControl
Spine runtime updated to version 2.1