Merge pull request #708 from shivalinga/dev-branch

DO-4843, DO-4702 Bugs has been fixed.
"Implemented additional changes for Add suggestions in collection edit under search"
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
Merge pull request #709 from sravanthi1/dev-branch

"Implemented additional changes for Add suggestions in collection edit under search"
Fixed issue with editing the folder title.
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #710 from VinRudramurthy/dev-branch

Fixed issue with editing the folder title.
Updated all API calls with ServerDownException.
Updated the error code for 504.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch:
  Fixed issue with editing the folder title.
  "Implemented additional changes for Add suggestions in collection edit under search"
  DO-4843, DO-4702 Bugs has been fixed.
  Fixed In FF browser ,under tags the default resource images is broken.
Merge pull request #711 from anilgooru/dev-branch

Bug fixes.
"[PPP] More space b/w toolbar and top container issue resolved."
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
"6.3 Parallel [Player - Text] Under More Info Gooru Course is missing a ":" + space Fixed"
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
Merge pull request #713 from sravanthi1/dev-branch

"6.3 Parallel [Player - Text] Under More Info Gooru Course is missing a ":" + space Fixed"
Merge pull request #712 from mitraj/dev-branch

[PPP] More space b/w toolbar and top container issue resolved.
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch

Conflicts:
	src/main/java/org/ednovo/gooru/client/service/AppService.java