Merge branch 'release/1.0.0'
Merge branch 'release/1.0.1'
comment out database config on master
ignore .gitattributes
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'

Conflicts:
	.gitignore
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
use SetEnvIf for fallback settings
handle 404 error from Wordpress