Fixed index
Merge branch 'master' into dev

Conflicts:
	tigerhack/marker/templates/index.html