Merge branch 'integration' of github.com:nens/lizard-client into integration
minimal cards get  correct height
Merge branch 'improve_timeline_controls' into dirk_minimal_cards_height_as_searchbar_height
changes.rst
Merge conflict
Merge pull request #246 from nens/dirk_minimal_cards_height_as_searchbar_height

Dirk minimal cards height as searchbar height