removed .gradle from vcs
Merge branch 'develop'

Conflicts:
	README.md
Merge branch 'master' into release

Conflicts:
	README.md
Updated .gitignore.
Merge branch 'develop'
Merge branch 'master' into release

Conflicts:
	.gitignore
Added update script for eclipse project.