Merge branch 'master' into ubuntu-master

Conflicts:

	config.sh.sed.in

diff --cc static/packages.css.sed.in
index f60f4a46261acef24a778ce7cd89f11c3a894e8b,ca44350e58f79e78809cf6b1dd470f5d65cb7b8c..dc2ef7d9793d941648bd4c5bbe171367b2e4b743
--- 1/static/packages.css.sed.in
--- 2/static/packages.css.sed.in
+++ b/static/packages.css.sed.in
@@@ -57,10 -51,17 +57,19 @@@ h1 
  }
  #pmoreinfo h3 {
               border-top: thin solid black;
 +           border-bottom: none;
 +           color: #5B4832;
  }
  
+ #impressum {
+     text-align: left;
+     float: left;
+ }
+ 
+ #sponsorfooter {
+       text-align: right;
+ }
+ 
  /*
  
    DESCRIPTIONS