Merge Develop

Config File Parsing
UI Settings