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
added preview status
removed preview status
Merge branch 'develop' into library

Conflicts:
	templates/default_site/resources.group/page.html
got rid of unnecessary h3
updated include link
turned off library widget's included css
cleaned up library search widget
updated config to work with remote develop server
Merge branch 'develop' of github.com:noslouch/shanghai-home
test commit
Merge branch 'library' into develop
Merge branch 'master' of ~/git/shanghai
another testcommit
Merge branch 'master' of ~/git/shanghai

Conflicts:
	nyush/expressionengine/config/config.php