Added loading Icons for path way.
Resolved conflicts.

Conflicts:

src/main/java/org/ednovo/gooru/client/mvp/classpages/unitSetup/unitsetup.css
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #1658 from VinRudramurthy/dev-branch

Added loading Icons for path way.