groundwork for library styles
Merge branch 'master' of github.com:noslouch/shanghai-home into library
Merge branch 'master' of github.com:noslouch/shanghai-home into library
groundwork for library styles
shanghai library widget styles
Merge branch 'library' of github.com:noslouch/shanghai-home into library
installed nsm live look. moving to staging to configure
template for resource previews
new page template for previews
update page preview
update resources/index
testing page preview
issues coming from includes/.share
that last commit message was wrong; issues were coming from includes/.nav-resources
preview template
adding preview template
updated index template and removed unused preview template
added preview status
removed preview status
Merge branch 'develop' into library

Conflicts:
	templates/default_site/resources.group/page.html