added p&t pill filedtype and publisher files
publisher driver folder
debugging iffy publisher install
resolved publisher looping bug thanks to boldminded
Merge branch 'master' into publisher
updated newsfeed entries to use {title} instead of {news-title}
updated events template to actually be used.
turned off ce_cache
Merge branch 'master' into publisher
Merge branch 'master' into publisher

Conflicts:
	nyush/expressionengine/config/config.php
installed freebie
installed playa
installed structure
install url to entry id plugin
structure entries plugin. not necessarry
updated templates to work with structure
css changes to work better with structure
installed new version of publisher
Merge branch 'master' into publisher
added status params to newsfeed templates
Merge branch 'publisher' of github.com:noslouch/shanghai-home into publisher
Merge branch 'master' into publisher

Conflicts:
	css/jquery.fancybox.css
	css/main.css
	css/main_ie6.css
	css/master.css