cleanup
exported config service
Merge branch 'master' into ice-cream-sandwich
fixed intents
Merge branch 'master' into ice-cream-sandwich