changing README file
modified license
Merge branch 'master' into groovy-devel

Conflicts:
	README.md