removed .gradle from vcs
merge
Merge branch 'master' into release

Conflicts:
	.gitignore
	README.md