books claim in article show
refs #1165, fixes state changes (forward,backward) to not scroll top
Category navigation in header now in one line
some tests for single_sign_on.rb
fixed #1049 added collect link and dropdown to cart show open

added tooltips to library titles
Merge pull request #1162 from fairmondo/feature-one-line-categories

Feature one line categories #1150
Merge branch 'master' into develop
refs #1072
Merge pull request #1166 from fairmondo/bug-backward-forward-scrolls-top

fixes state changes (forward,backward) to not scroll top #1165
Merge pull request #1167 from fairmondo/bug-dash-in-transport_time

refs #1072, fixes bug when having a dash transport_time (during CSV import)
Update README.rdoc
Merge branch 'master' into develop
Merge branch 'master' into develop
Merge pull request #1142 from fairmondo/feature-collect

"Andere Dinge haben Priorität"
Merge branch 'master' into develop
small text changes directly commissioned by felix
move welcome page social buttons (directly commissioned by felix)
for #1174 - tooltips for filter btns
for #1174 - only show social footer btns on welcome page
Merge branch 'feature-books-and-coop-box' into develop