Update .gitignore
Merge remote-tracking branch 'origin/master' into v1.0-dev

Conflicts:
	.gitignore
Bug: javascript error when processing return values from jQuery.ajax() call.