WIP
Merge branch 'master' of https://github.com/LartTyler/SolusRpg

Conflicts:
	src/me/dbstudios/solusrpg/RpgPopupFactory.java
	src/me/dbstudios/solusrpg/gui/popups/WelcomePopup.java