bug fix in chart data
fix bug in decision add brand/sku

Improve with SKUID/BrandID calculation mechanism to get right ID with
discontinue involved
Merge branch 'haosun'
fixed translation
fixed C2 Perception Map Color bug
fixed color
Merge branch 'master' of https://github.com/ludwiksh/Marksimos

Conflicts:
	public/app/js/translation.js
fixed