Merge branch 'master' into openid

Conflicts:
	app/controllers/user_controller.rb

test/fixtures/gpx_files.yml

@@ -14,7 +14,7 @@ public_trace_file:
 anon_trace_file:
   id: 2
   user_id: 2
-  visible: false
+  visible: true
   name: Private Trace.gpx
   size: 123
   latitude: 51.3
@@ -27,7 +27,7 @@ anon_trace_file:
 trackable_trace_file:
   id: 3
   user_id: 2
-  visible: false
+  visible: true
   name: Trackable Trace.gpx
   size: 123
   latitude: 51.51
@@ -40,7 +40,7 @@ trackable_trace_file:
 identifiable_trace_file:
   id: 4
   user_id: 2
-  visible: false
+  visible: true
   name: Identifiable Trace.gpx
   size: 123
   latitude: 51.512
@@ -49,3 +49,16 @@ identifiable_trace_file:
   visibility: "identifiable"
   description: This trace shows trksegs, timestamps and user details.
   inserted: true
+
+deleted_trace_file:
+  id: 5
+  user_id: 2
+  visible: false
+  name: Deleted Trace.gpx
+  size: 123
+  latitude: 51.512
+  longitude: 0.142
+  timestamp: "2009-07-30 17:48:34"
+  visibility: "public"
+  description: This is a trace that has been deleted.
+  inserted: true