Litlle corrections
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/plugins/Main.java