FI changes
Merge pull request #60 from amansinh/ui-dev

FI changes
Fixed errors related to config parser conflicts with database