up
Merge branch 'master' of https://github.com/Stigol-LLC/Divitron

Conflicts:
	Assets/GameScene.unity
upgrade
Merge branch 'master' of https://github.com/Stigol-LLC/Divitron

Conflicts:
	Assets/Resources/UI/ViewManager.xml
Merge branch 'master' of https://github.com/Stigol-LLC/Divitron
Merge branch 'master' of https://github.com/Stigol-LLC/Divitron
Merge branch 'master' of https://github.com/Stigol-LLC/Divitron
fix bug in version 1.1
facebook