Merge pull request #1226 from SurabhiSeetharam/dev-branch

Minor UI and text changes and changed hover state for resource thumbnails
Fixed issue on 'Resource already exists' popup when adding a new resource.
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch