heroku bugfix for static and media files
template 500.html renamed for easier debugging
500.html removed
heroku merge