updates
update
version updates
nav-menu and bug fixes
Merge branch 'master' into develop

Conflicts:
	index.html
Merge branch 'master' into version/blog-kit
Merge branch 'version/blog-kit' into develop
Merge branch 'master' into develop

Conflicts:
	index.html
Merge pull request #6 from shawnsandy/develop

Develop