Commit prior to pull of repository
Merge branch 'master' of https://github.com/PorMMo/PorMMo

Conflicts:
	target/classes/project/senior/app/pormmo/UserInterfaceFrame$MediaControlsListener.class
	target/classes/project/senior/app/pormmo/UserInterfaceFrame$UserInterfaceFrameMenuListener.class
attempt to re-merge repo to changes made locally
Attempt to merge stash with upstream
Another attempt to merge