Merge branch 'object_details' into experimentaland some xlarge layoutsand detailed error handling in placeConflicts: AndroidManifest.xml src/com/rackspacecloud/android/ListContainerActivity.java src/com/rackspacecloud/android/ListServersActivity.java...