made some changes to the main view so most stuff now shows in the
application
Merge branch 'master' of
https://github.com/RealStandardStudios/RpgApp.git

Conflicts:
	characters/Bakarmos.cdf
	src/view/InventoryPartialController.java
	src/view/partials/dialogs/partials/EquipmentPartialController.java