Merge branch 'master' into fleet-action

Conflicts:
	lib/Lacuna/DB/Result/Building/Shipyard.pm
	lib/Lacuna/RPC/Captcha.pm
	var/www/public/changes.txt