Merge commit 'origin/0.9.x' into 0.9.x

diff --cc db/08to09_pg.sql
index c2fabf63ba3f97ab6f6061bfcaf459fdd8e23508,498a94e68a505450e7ecc62b73d052748bf96f44..d3eb644437f7b5ea6e6684fa5462e67d95bbbfa0
--- 1/db/08to09_pg.sql
--- 2/db/08to09_pg.sql
+++ b/db/08to09_pg.sql
@@@ -100,22 -100,23 +100,41 @@@ insert into queue_item_new (frame,trans
  alter table queue_item rename to queue_item_old;
  alter table queue_item_new rename to queue_item;
  
+ ALTER TABLE confirm_address ALTER column sent set default CURRENT_TIMESTAMP;
+ 
+ create table user_location_prefs (
+     user_id integer not null /*comment 'user who has the preference'*/ references "user" (id),
+     share_location int default 1 /* comment 'Whether to share location data'*/,
+     created timestamp not null /*comment 'date this record was created'*/,
+     modified timestamp /* comment 'date this record was modified'*/,
+ 
+     primary key (user_id)
+ );
+  
+ create table inbox (
+ 
+     user_id integer not null /* comment 'user receiving the notice' */ references "user" (id),
+     notice_ids bytea /* comment 'packed list of notice ids' */,
+ 
+     primary key (user_id)
+ 
+ );
  
 +create table user_location_prefs (
 +    user_id integer not null /*comment 'user who has the preference'*/ references "user" (id),
 +    share_location int default 1 /* comment 'Whether to share location data'*/,
 +    created timestamp not null /*comment 'date this record was created'*/,
 +    modified timestamp /* comment 'date this record was modified'*/,
 +
 +    primary key (user_id)
 +);
 + 
 +create table inbox (
 +
 +    user_id integer not null /* comment 'user receiving the notice' */ references "user" (id),
 +    notice_ids bytea /* comment 'packed list of notice ids' */,
 +
 +    primary key (user_id)
 +
 +);
 +