conflict index fix
Merge branch 'master' of https://github.com/jordy-bollen/eenmaal-andermaal

Conflicts:
	php/application/view/index.php