Added master page.
Convert pages to inherit from master page.
Fix merge conflicts.

Conflicts:
	src/views/home.html