added .DS_Store to .gitignore
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
up jars to 1.9.1
Merge pull request #7 from vpacher/1.9.1

1.9.1 jars