Update layout.html

Changed links
Update layout.html

Formatted the footer
Merge branch 'develop' into layout

Conflicts:
	views/layout.html
Merge branch 'layout' into develop