Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
"dev api's integration"
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

Conflicts:
	src/main/java/org/ednovo/gooru/client/mvp/classpages/edit/EditClasspagePresenter.java
"Analytics chages done"
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
Merge pull request #1812 from suryanarayanakb/dev-branch

"analytics reports"