Some updates
Merge branch 'master' of http://github.com/punkave/apostrophe
Merge branch 'master' of http://github.com/punkave/apostrophe
Merge branch 'master' of http://github.com/punkave/apostrophe
Merge branch 'master' of http://github.com/punkave/apostrophe
Merge branch 'master' of http://github.com/punkave/apostrophe
Initial guts for Lister integration
Merge branch 'master' of http://github.com/punkave/apostrophe
Merge branch 'master' of http://github.com/punkave/apostrophe

Conflicts:
	public/js/content.js