Merge branch 'release-1.0'
Merge branch 'dev' into feature-footer
adding more to footer menu items
removing footer title
Merge branch 'feature-footer' into dev
Lorem spelling fix
Merge branch 'hotfix-spelling-fix' into dev

Conflicts:
	index.html