gallery and english
Merge branch 'master' of https://github.com/Saronet/Rising-Star

Conflicts:
	platforms/ios/www/css/small.css