pre-update ui
Merge branch 'master' of https://github.com/rnanda/CET

Conflicts:
	cet/feed/templatetags/__init__.pyc
	cet/feed/templatetags/feed_template_tags.pyc
	templates/.DS_Store