Merge pull request #4 from yawenc/master

some updates
commit before merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	Idon8-grailsPlugins.iml
committing weekend updates