Added configuration system
Added exception for non existing setting
Made modifications to the menu
Merge remote-tracking branch 'origin/develop' into develop