Add fix1 home text
link text name
New footer update
Merge branch 'master' into fix1

Conflicts:
	.idea/workspace.xml