work on language support
Merge branch 'development' into Jeroen

Conflicts:
	index.php
pin bug met selenium opgelost
pin fix: ":" ipv "," thomas :)
Merge commit '229df6f9611ee38ca693a7bd3bf2ef30b431b6d7' into Jeroen
include content.inc.php overal weggehaald
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
meta tags
user insert query to SP
passwordfix
Merge branch 'Jeroen' into development
nog 1 kleine fix
change back
still testing login change
working on login
still working on login
institute pagina aangepast voor assignments