Merge pull request #80 from fadler/fadler_dev

Fadler dev
Merge remote-tracking branch 'origin/master' into vadler_dev
Merge remote-tracking branch 'origin/fadler_dev' into vadler_dev
[VA] {refactoring} options menu

reworked options menu: there are now 3 categories (misc, sound,
graphics)
[VA] {refactoring} options menu

added possibility to change graphics quality
merge

merge
Merge remote-tracking branch 'origin/master' into vadler_dev
Merge remote-tracking branch 'origin/fadler_dev' into vadler_dev
Merge remote-tracking branch 'origin/fadler_dev' into vadler_dev
[FA]{bugfix} detectionScore division by 0

fixed a bug where a division by 0 occurs when the  detectionTime is 0
[VA] {refactoring} new UnitTests

added new unit tests
Merge remote-tracking branch 'origin/vadler_dev' into fadler_dev