Added error500 page, but it is not working
Cleanup ES doc index page
Merge remote-tracking branch 'origin/master'