cleanup
exported config service
Merge branch 'master' into beta
fixed intents
Merge branch 'master' into beta