- commit of conflicting resources
Merge remote-tracking branch 'origin/dev1' into dev1

Conflicts:
	src/main/java/komodo/rpg/sounds/RPGSound.java