Added bug list to the main page
Fixed merge issues