Adding some style
Moving style
Merge branch 'master' into gh-pages
Moving styles
Theme previewing done
Style changes
Double checking the conflicts.. Frustrating..
.. what is going on
Merge branch 'development' into gh-pages