Merge disorder.userman branch

diff --cc CHANGES
index e638f434cdb630b2010b347d9e0d0bfdfbf74696,e1909eb2e457ceef1d31295f2a5e78de8ce5388e..773115330e041288ee788b7ec30701b1c04756b9
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -16,17 -16,11 +16,22 @@@ This has been completely rewritten to s
       time before a played track can be picked at random.  The default is
       8 hours (which matches the earlier behaviour).
  
+ ** Disobedience
+ 
+ There is now a new user management window.  From here you can add and
+ remove users or modify their settings.
+ 
 +* Changes up to version 3.0.2
 +
 +Builds --without-server should work again.
 +
 +The web interface is a bit more liberal in the cookie value syntax it
 +will accept.
 +
 +* Changes up to version 3.0.1
 +
 +Debian upgrades from 2.0.x should now work better.
 +
  * Changes up to version 3.0
  
  Important!  See README.upgrades when upgrading.

diff --cc configure.ac
Simple merge

diff --cc lib/Makefile.am
Simple merge