updated navigation
updated web.config
edited web.config
Merge branch 'dev'

Conflicts:
	.gitignore
re-created web.config
Merge branch 'dev'