Content provider for Profile and Wizard One; Profile Activity
Merge remote-tracking branch 'origin/master'