Merge pull request #882 from mitraj/dev-branch

Added I18N support for shelf pkg
Fixed the save | cancel need to be consistent
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #884 from nutan-gooru/dev-branch

Fixed the save | cancel need to be consistent
Added I18N support.
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #885 from VinRudramurthy/dev-branch

Added I18N support.
"Adding I18N support for Addresource pkg"
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch

Conflicts:
	src/main/java/org/ednovo/gooru/client/mvp/shelf/collection/tab/resource/add/AddQuestionResourceView.java
	src/main/java/org/ednovo/gooru/client/mvp/shelf/collection/tab/resource/add/AddUserOwnResourceView.java