Add missing lines to lang/en.html

Added the missing objects to lang/en.html and index.html and also removed the erroneous <<<<<< HEAD line from index.html.