Index, Server style Formatting
Merge branch 'master' of https://github.com/dmitrioligy/Tribal-Conquest

Conflicts:
	Unit.js