merging all changes into master, spellbook and movement