Farm levels 1_3, 1_4 and Boss Key amended
Merge branch 'master' of https://github.com/jokigenki/Foxtrot

Conflicts:
	resources/data.xml
	resources/data.xml.bak