BROKEN: begin implementing lwi changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/AndroidManifest.xml
	app/project.properties
	app/res/layout/fragment_people_list.xml
	app/res/layout/fragment_profile_header.xml
	app/res/layout/fragment_profile_header_page_labels.xml
	app/res/layout/item_contact_more_header.xml
	app/res/layout/item_contact_more_icontext.xml
	app/res/layout/item_contact_more_text.xml
	app/res/layout/item_interaction.xml
	app/res/values/colors.xml
	app/res/values/styles.xml
	app/src/com/missionhub/activity/ProfileActivity.java
	app/src/com/missionhub/fragment/HostedPeopleListFragment.java
	app/src/com/missionhub/fragment/ProfileFragment.java
	app/src/com/missionhub/people/DynamicPeopleListProvider.java
	app/src/com/missionhub/people/PeopleListProvider.java
	app/src/com/missionhub/ui/ExpandableObjectArrayAdapter.java
	app/src/com/missionhub/ui/FragmentArrayPagerAdapter.java
	app/src/com/missionhub/ui/ObjectArrayAdapter.java
	app/src/com/missionhub/ui/widget/ParallaxListView.java