Conflits resolved.
[GFP]-[Admin portal] Please enable access to normal user account as well - Implemented.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch:
  "Added the question image and tool tip for sessions"
  "Added the print,save and email icon. Changed the personalize unit code"
  Added print ,save and email images
  "analytics moving static text to message properties"

Conflicts:
	src/main/java/org/ednovo/gooru/shared/i18n/MessageProperties.java
	src/main/java/org/ednovo/gooru/shared/i18n/MessageProperties.properties
Merge pull request #1971 from anilgooru/dev-branch

Dev branch