Fixed errors related to config parser conflicts with database
Merge pull request #61 from sudarsku/ui-dev

Fixed errors related to config parser conflicts with database