Merge branch 'master' into small_fixes
changed prices