"DO-4656,DO-4662 and DO-4647 fixed."
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch-2
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch-2
Merge pull request #471 from ssushma/dev-branch

Text changes for email template implemented.
Test commit for github
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch-2
Merge pull request #474 from sravanthi1/dev-branch

"6.3 [my Collections] Chrome & IE: In edit info of the resource through URL the resource format drop down is misplaced","6.3 [Player] IMDB website shows blank at player" and "6.3 [Search] UI: Standard code overlaps description" changes fixed.
Merge pull request #473 from SurabhiSeetharam/dev-branch

Test commit for github
created initial support for DnD for the folders.
Resolved conflicts.

Conflicts:

src/main/java/org/ednovo/gooru/client/mvp/shelf/collection/tab/resource/item/CollectionEditResource.css

src/main/java/org/ednovo/gooru/client/mvp/shelf/collection/tab/resource/item/CollectionEditResourceCBundle.java
"Show admin role in Settings."
"[FE] Add Classcode to Classes in Teach Implemented."
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch-2
Merge pull request #475 from mitraj/dev-branch

Show admin role in Settings.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch-2
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
"[FE] Add Classcode to Classes in Teach Implemented."
Merge pull request #476 from sravanthi1/dev-branch

"[FE] Add Classcode to Classes in Teach Implemented."
"Fix the position of navigation bar in player."
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch