Merge branch 'master' of https://github.com/t-ruas/wynn

Conflicts:
	source/static/darty.wynn.gui.details.js