added ignore for app/config
Merge remote-tracking branch 'origin/master' into htaccessFix