Merging
Merge branch 'master' of http://github.com/Qvazar/WheelsOfWar

Conflicts:
	public/src/scripts/main.coffee