made some changes which are untested becuase its broken
Merge branch 'master' of
https://github.com/RealStandardStudios/RpgApp.git

Conflicts:
	src/view/partials/dialogs/NewCharacterController.java