ש
Merge branch 'master' of https://github.com/Saronet/Rising-Star

Conflicts:
	platforms/ios/www/index.html
ש
ש
Merge branch 'master' of https://github.com/Saronet/Rising-Star

Conflicts:
	platforms/ios/www/index.html
Merge branch 'master' of https://github.com/Saronet/Rising-Star