Fixed CORE-1792([GAT] Need API support for update the host filed of the resource)
Merge pull request #654 from saravanab/master

Fixed CORE-1792([GAT] Need API support for update the host filed of the ...
Added entity operation for school and district in CountryRestV2Controller
Added entity operation for school and district in CountryRestV2Controller
Merge pull request #655 from yamunaBQ/master

Added entity operation for school and district in CountryRestV2Controlle...
Merge pull request #656 from sheebans/master

Moved the school and school district api to separate controller
added try catch block in setviewscount method for  number format exception
Merge pull request #657 from skpcharles/master

added try catch block in setviewscount method for  number format excepti...
Merge branch 'master' of https://github.com/Gooru/Gooru-Core-API

Conflicts:

api/src/main/java/org/ednovo/gooru/domain/service/ScollectionServiceImpl.java