sidebar fix conflict

Conflicts:
	javascripts/app/engine/gameengine.js