homepage added, login page renamed
merge files