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

Conflicts:
cet/admin/__init__.pyc
cet/admin/models.pyc
cet/certificate_application/__init__.pyc
cet/certificate_application/models.pyc
cet/cet/__init__.pyc
cet/cet/settings.pyc
cet/cet/wsgi.pyc
cet/feed/__init__.pyc
cet/feed/models.pyc
conflicts
Merge branch 'master' of https://github.com/rnanda/CET

Conflicts:
	cet/admin/__init__.pyc
	cet/admin/models.pyc
	cet/certificate_application/__init__.pyc
	cet/certificate_application/models.pyc
	cet/cet/__init__.pyc
	cet/cet/settings.pyc
	cet/cet/wsgi.pyc
	cet/feed/__init__.pyc
	cet/feed/models.pyc