"implemented in the players"
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

Conflicts:
	src/main/java/org/ednovo/gooru/client/mvp/analytics/util/HCLineChart.java
Merge pull request #1821 from suryanarayanakb/dev-branch

"implemented in the players"