to push on monday
updated nav sprites
Merge branch 'master' into mass_prepare