updated gitignore, new branch
new config files
modified config
test commit
test commit from local machine
fixed misbehaving config file
test commit
updated resources pages
spellchecker defaults to on
Merge branch 'master' of github.com:noslouch/shanghai-home
Merge branch 'master' into develop
updated EE config files. updated ignore to include these files
Merge branch 'master' of github.com:noslouch/shanghai-home
Merge branch 'master' of github.com:noslouch/shanghai-home into develop

Conflicts:
	.gitignore
installed nsm live look. moving to staging to configure
template for resource previews
new page template for previews
update page preview
update resources/index
testing page preview
issues coming from includes/.share