????
Merge branch 'master' of
https://github.com/RealStandardStudios/RpgApp.git

Conflicts:
	src/view/partials/dialogs/partials/ClassPartialController.java
Merge branch 'master' of https://github.com/RealStandardStudios/RpgApp.git
Merge branch 'master' of https://github.com/RealStandardStudios/RpgApp.git