added string highlithing, fixed bugs
Merge branch 'Editor' of https://github.com/ccebinger/SWPSoSe14 into Editor