update
update
update
Merge branch 'master' of https://github.com/SquierDotQn/Plugins

Conflicts:
	src/model/PluginFinder.java
update