Merge commit '863d90653054fc2f051d7486d7e2bb69dfacddb6'
Replace the skill with zero data by another equivalent skill
Merge commit 'fa6ba5d9ce06c3008f36222b057530142be8f753'

Conflicts:
	src/main/webapp/assets/modules/skill-analytics/skill-analytics.con.js