merge NG auth, RT#21563

diff --cc FS/FS.pm
Simple merge

diff --cc FS/FS/Conf.pm
Simple merge

diff --cc FS/FS/Mason.pm
Simple merge

diff --cc FS/FS/Record.pm
Simple merge

diff --cc FS/FS/Schema.pm
Simple merge

diff --cc FS/FS/UI/Web.pm
index c8ad430,c11e6c9..f63854c
--- 1/FS/FS/UI/Web.pm
--- 2/FS/FS/UI/Web.pm
+++ b/FS/FS/UI/Web.pm
@@@ -581,8 -578,8 +581,8 @@@ use vars qw($DEBUG)
  use Carp;
  use Storable qw(nfreeze);
  use MIME::Base64;
 -use JSON;
 +use JSON::XS;
- use FS::UID qw(getotaker);
+ use FS::CurrentUser;
  use FS::Record qw(qsearchs);
  use FS::queue;
  use FS::CGI qw(rooturl);

diff --cc FS/FS/cust_main.pm
Simple merge

diff --cc FS/FS/cust_pay.pm
Simple merge

diff --cc FS/FS/cust_pkg.pm
Simple merge

diff --cc FS/MANIFEST
index 9423290,d2b7013..ee18407
--- 1/FS/MANIFEST
--- 2/FS/MANIFEST
+++ b/FS/MANIFEST
@@@ -688,5 -690,5 +692,7 @@@ FS/part_pkg_usage.p
  t/part_pkg_usage.t
  FS/cdr_cust_pkg_usage.pm
  t/cdr_cust_pkg_usage.t
 +FS/part_pkg_msgcat.pm
 +t/part_pkg_msgcat.t
+ FS/access_user_session.pm
+ t/access_user_session.t

diff --cc FS/bin/freeside-upgrade
Simple merge