404_test
404, 500 html and image
correcting urls, removing old 404 pages, renaming those made by nikita to 404.html, 500.html so that django can autodetect them
--modified image names
Merge remote-tracking branch 'origin/social_live' into social_connect

Conflicts:
	social_website/urls.py
Merge pull request #168 from digitalgreenorg/social_connect

404, 500.