Merge branch 'master' into newmc

Conflicts:
	app.psgi

diff --cc app.psgi
index 5d3c8987f48b80f1b2877bfdefb632b96641a6e2,dc9f75b333b5112b99bca0cb0f8a486b9d55069e..fd1bcac6e68776f6b2ae82b51df654c6d42e306c
--- 1/app.psgi
--- 2/app.psgi
+++ b/app.psgi
@@@ -12,8 -12,8 +12,8 @@@ use Log::Log4perl
  use Tie::Hash::Expire;
  
  use constant AUTH_TIMEOUT => 5 * 60;
- use constant ACCESSLOG_FORMAT => '%{X-Forwarded-For}i|%h %u "%r" %>s %b "%{Referer}i" "%{User-agent}i"';
+ use constant ACCESSLOG_FORMAT => 'combined';
 -use constant CONTENT_SECURITY_POLICY => q,default-src 'none'; script-src 'self'; style-src 'self'; img-src 'self'; connect-src 'self',;
 +use constant CONTENT_SECURITY_POLICY => q,default-src 'none'; script-src 'self' static.mindcoding.ro www.google-analytics.com; style-src 'self' static.mindcoding.ro; img-src 'self' static.mindcoding.ro www.google-analytics.com; connect-src 'self',;
  
  our $db //= Gruntmaster::Data->connect($ENV{GRUNTMASTER_DSN} // 'dbi:Pg:');
  

diff --cc lib/Plack/App/Gruntmaster.pm
Simple merge