* user party colors for charts
Merge branch 'master' into production