Merge remote-tracking branch 'origin/costumes-sounds' into costumes-sounds

# Conflicts:
#	assets/project.json
#	config.py
#	main.py

Author: Secret-chest