git ignore update
Merge branch 'dev' of github.com:frankjdelgado/MailcourierSAP into dev

Conflicts:
	.gitignore
	sap.sublime-workspace