Ganomi master

rebased version of https://github.com/owncloud/bookmarks/pull/92

will merge after travis success