merge localwiki-bootstrap-theme