Yay
Merge branch 'master' of https://github.com/Sylla-bus/SeriousAdventures

Conflicts:
	src/java/com/sa/SeriousAdventures.java