In StartActivity.java  code by Sharif is Comment outed.
Merge branch 'master' of https://github.com/Apptitive/Apptitive-Content-Display

Conflicts:
	content display/src/main/AndroidManifest.xml
	content display/src/main/java/com/apptitive/content_display/MainActivity.java
	content display/src/main/java/com/apptitive/content_display/StartActivity.java
	content display/src/main/java/com/apptitive/content_display/sync/SyncAdapter.java
	content display/src/main/java/com/apptitive/content_display/sync/SyncUtils.java
to get update
MainActivity.java is Ready . clone of StartActivity.java.
Unnecessary files are dropped.
Merge branch 'master' of https://github.com/Apptitive/Apptitive-Content-Display

Conflicts:
	content display/src/main/java/com/apptitive/content_display/StartActivity.java