Fix some issues
Merge branch 'master' of https://github.com/owncloud/bookmarks
[tx-robot] updated from transifex
first commit

changed leftcontent rightcontent
into app-navigation & app-content
update settings template
merge master