Java Files Updated
Merge branch 'master' of https://github.com/OpenFireSecurity/OpenFireMessenger

Conflicts:
	Java/Client/GUI.java
Java Files Updated