Merge branch 'master' of https://github.com/Boreeas/ircbot

Conflicts:
	pom.xml
	src/main/java/net/boreeas/irc/App.java
	src/main/java/net/boreeas/irc/Command.java
	src/main/java/net/boreeas/irc/CommandHandler.java
	src/main/java/net/boreeas/irc/EventPump.java
	src/main/java/net/boreeas/irc/IrcBot.java
	src/main/java/net/boreeas/irc/Preferences.java
	src/main/java/net/boreeas/irc/TimeoutCheck.java
	src/main/java/net/boreeas/irc/events/ChannelModeChangeEvent.java
	src/main/java/net/boreeas/irc/plugins/PluginClassLoader.java
	src/main/java/net/boreeas/irc/plugins/PluginLoader.java
	src/main/java/net/boreeas/irc/plugins/PluginManager.java
	src/test/java/net/boreeas/irc/plugins/PluginManagerTest.java