updated config
fixed merge conflicts
added portal config_dir
fixed get resourcelocator bug
code review & cleanup
Merge branch 'feature/configuration' into develop