Layout
Merge branch 'develop' of https://github.com/dansku/coverme into develop