server side commit
Merge branch 'master' of ssh://github.com/benvanstaveren/wot-replays

Conflicts:
	public/js/wtr.js