lots of changes to htaccess and controllers
Merge branch 'master' of https://github.com/JorikTM/Webtech