change triangle to the onigiri
fix UI
Merge branch 'feature/develop2' into feature/develop

Conflicts:
	public/js/game.client.js
Merge remote-tracking branch 'origin/develop' into feature/develop