Merged new Community Content example and odk-2.0.1353