Added sharedPreferences to replace contentdatasource
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Added sharedPreferences to replace contentdatasource