Merge branch 'master' into newmc

Conflicts:
	app.psgi
	log.conf

diff --cc app.psgi
Simple merge

diff --cc log.conf
index a0f2bdab500841236d09de84174d51898b901345,1f3132357ac49ca7b591e2ecf6c11c5ad667f270..dbde8c99849fd272e94c9eb7ee599934edcd195f
--- 1/log.conf
--- 2/log.conf
+++ b/log.conf
@@@ -1,5 -1,4 +1,4 @@@
 -log4perl.category. = TRACE,
 +log4perl.category. = TRACE, stderr
- log4perl.category.access = INFO, accesslog
  
  log4perl.appender.stderr                          = Log::Log4perl::Appender::Screen
  log4perl.appender.stderr.layout                   = Log::Log4perl::Layout::PatternLayout