get up to date for merge

diff --cc inc/poche/Database.class.php
Simple merge

diff --cc inc/poche/Poche.class.php
Simple merge

diff --cc themes/baggy/config.twig
Simple merge

diff --cc themes/baggy/css/main.css
Simple merge

diff --cc themes/default/config.twig
Simple merge