added parameter in re-order popup
resolved Conflicts
Added default text if there is no assignments in pathway at unit setup.
Resolved Conflicts.

Conflicts:

src/main/java/org/ednovo/gooru/shared/i18n/MessageProperties.java

src/main/java/org/ednovo/gooru/shared/i18n/MessageProperties.properties
Merge pull request #1710 from VinRudramurthy/dev-branch

Added default text if there is no assignments in pathway at unit setup.
Implemented : removed beta and added new fav icon.
Changed version no.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch:
  Added default text if there is no assignments in pathway at unit setup.
  "static changes updated to properties file"
  UI Changes updated
  MOved static text.
  Adjusted the completed buble status
  Time of studying ui and validations added.
  study button has been implemented in student view.
  moved text to sratic file.
  Changes for new parameter and UI changes
  Student assignment view has been modified.
  fixed assignment issue and pagination issue for student
  "static text moved to properties file for this org.ednovo.gooru.client.mvp.classpages.unitdetails package"
  Removed unused file and passed item seq to reorder.
  "added image "
  "analytics progress data"
  "Added SetScore Api integration and Validations added."
  update assignment details API has been modified.
  "update progressevent changes"
  "Bubble button changes updated for student view"
added comments.
Merge pull request #1711 from anilgooru/dev-branch

Implemented : removed beta and added new fav icon.
Changes for displaying zero assignments in student mode.
implemented pathwayItemMoveWithReorder api
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #1712 from ssushma/dev-branch

Changes for displaying zero assignments in student mode.
Merge pull request #1713 from nutan-gooru/dev-branch

Implemented pathwayItemMoveWithReorder api
fixed slected pathway id issue
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #1714 from nutan-gooru/dev-branch

Fixed slected pathway id issue
changes for tick mark display
Merge pull request #1715 from ssushma/dev-branch

changes for tick mark display