Lots of work on Class creation
Uptate Pom
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/plugin.yml