Added wp-config-sample to .gitignore
Merge branch 'dev' into beta
Merge branch 'beta'