adjust Doxyfile, fix Bug (Output_dir)
Merge branch 'master' of https://github.com/ccebinger/SWPSoSe14