Merge pull request #55 from ThomasRahn/Alan

Some fixes.
Language fixes
merged alan changes
forgot master
Merge branch 'Development' of github.com:ThomasRahn/soen390 into Alan