recover
Merge branch 'yy' of github.com:yoarcher/Shingeki-no-Kyojin into yy

Conflicts:
	transfer.php