fixed bug in generating the internal graph; added enums to ApplicationPreferences; minor changes;
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14