[TASK] changed gitignore for working with php storm
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
[TASK] remove tracking of configuration files