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
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
Removed privacy message in signup for e-mail
implemented NGSS to Standards Preference
Merge pull request #481 from VinRudramurthy/dev-branch

Removed privacy message in signup for e-mail
resolved conflicts
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #482 from nutan-gooru/dev-branch

Implemented NGSS to Standards Preference
CSS for assignment progress