html fixes
Merge branch 'master' of https://github.com/rnanda/CET

Conflicts:
	cet/cet/__init__.pyc
	cet/cet/settings.pyc
	cet/cet/urls.pyc
	cet/cet/views.pyc
	cet/cet/wsgi.pyc
	cet/feed/__init__.pyc
	cet/feed/forms.pyc
	cet/feed/models.pyc
	cet/feed/views.pyc
	templates/cet/static/script.js
	templates/static/script.js
sdcs
kjbsvs

Conflicts:
	cet/cet/__init__.pyc
	cet/cet/settings.pyc
	cet/cet/urls.pyc
	cet/cet/views.pyc
	cet/cet/wsgi.pyc
	cet/feed/__init__.pyc
	cet/feed/forms.pyc
	cet/feed/models.pyc
	cet/feed/views.pyc
	templates/cet/static/script.js
	templates/static/script.js