testing resolution stuff
Merge branch 'design' into gh-pages