sheet duplication restored
merge conflict
Merge branch 'content' of git://github.com/vingtetun/gaia into haida-content
mc
Merge pull request #66 from michalbe/haida-content

sheet duplication restored