Up Decors et tralala
Merge branch 'MASTER3' of https://github.com/Kannar/UndefinedEnnemy into MASTER3

Conflicts:
	scripts/js/config/image_data.js