ignore and logs
Merge remote-tracking branch 'origin/master'

Conflicts:
	_/application/logs/sql.log
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore