Changes
Merge remote-tracking branch 'origin/plugman' into plugman

Conflicts:
	src/com/commandsex/helpers/plugman/PluginManager.java