Added default home page
Merged with latest changes