work on language support
Merge branch 'development' into Jeroen

Conflicts:
	index.php
Merge commit '229df6f9611ee38ca693a7bd3bf2ef30b431b6d7' into Jeroen
EER en create van versie 5.1 database
Merge branch 'Jeroen' of https://github.com/Mauricevb/42IN07SOb into Jeroen
small fixes
Merge branch 'Jeroen' into development

Conflicts:
	index.php