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
"[FE] Add Classcode to Classes in Teach Implemented."
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch-2
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
Reverted DnD changes made for re-ordering
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #478 from VinRudramurthy/dev-branch

Reverted DnD changes.
Merge pull request #477 from mitraj/dev-branch

Fix the position of navigation bar in player.
Implemented privacy message
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Added Static text to MP file.
Merge pull request #479 from VinRudramurthy/dev-branch

Implemented privacy message and added Static text to MP file.
Changed text from Lexile Level to Reading Level
Merge pull request #480 from SurabhiSeetharam/dev-branch

Changed text from Lexile Level to Reading Level