maj index
Merge branch 'master' of https://github.com/Valkyria/Relikt.git

Conflicts:
	app/View/Pages/index.ctp