Removed some unused imports etc.
Merge branch 'master' of https://github.com/Berugi/ACE_13-14_Groep2_STTW