added additional info
fixed merge confict
Merge branch 'master' of github.com:youngsoul/VaadinSupportPlugin

Conflicts:
	README.md