Merge remote-tracking branch 'upstream/release-6.2' into release-6.2
Merge remote-tracking branch 'upstream/release-6.2' into release-6.2
Merge remote-tracking branch 'upstream/release-6.2' into release-6.2
Fixed suggested keyword are displayed at the middle of the screen
resolved conflicts after merge
Merge pull request #35 from nutan-gooru/release-6.2

Fixed suggested keyword are displayed at the middle of the screen
Merge pull request #36 from suryanarayanakb/release-6.2

metadata UI and assets implementation for web resource in Collection-Edit
updated text in message properties file.
Merge branch 'release-6.2' of https://github.com/Gooru/Gooru-Web into release-6.2

# By Chandra (1) and others
# Via anil kumar (4) and others
* 'release-6.2' of https://github.com/Gooru/Gooru-Web:
  metadata UI and assets implementation for web resource in Collection-Edit
  Fixed suggested keyword are displayed at the middle of the screen
  Mixpanel events added for OER Resouces in Search
  Displaying resource and question count for the collections : Implemented for more-info for resource and collection-resource players and resource-search more-info pages.
Updated UI for new system Tags in Collection Info tab.
Handled ratings for anonymous users in preview-player
Merge branch 'release-6.2' of https://github.com/Gooru/Gooru-Web into release-6.2
Merge pull request #37 from anilgooru/release-6.2

Updated UI file for Collection Info Tab.
Merge pull request #38 from VinRudramurthy/release-6.1.5

Handled ratings for anonymous users in preview-player
Adding new meta data fields - UI and assets design
Merge remote-tracking branch 'upstream/release-6.2' into release-6.2

Conflicts:
	src/main/java/org/ednovo/gooru/shared/util/MessageProperties.java
Merge pull request #39 from sravanthi1/release-6.2

Adding new meta data fields - UI and assets design
Teacher Tip Functionality and UI implemented under collection edit share tab
Added this dev config file for easier Jenkins build configuration.
Merge pull request #40 from ssushma/release-6.2

Teacher Tip Functionality and UI implemented under collection edit share...