Merge pull request #525 from anilgooru/dev-branch

6.4 Stories implemented.
added ui for tags resource
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
"Updatecollection api modified from v1 to v2 and publish functionality added."
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch

Conflicts:
	src/main/java/org/ednovo/gooru/shared/model/content/CollectionDo.java
	src/main/java/org/ednovo/gooru/shared/util/MessageProperties.java
Merge pull request #526 from nutan-gooru/dev-branch

added ui for tags resource
Merge pull request #527 from mitraj/dev-branch

Updatecollection api modified from v1 to v2 and publish functinality implemented.
Fixed issue with showing line fro last element.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch:
  "Updatecollection api modified from v1 to v2 and publish functionality added."
  added ui for tags resource