"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
Merge pull request #886 from nutan-gooru/dev-branch

Fixed Questions Submit button inconsistency
Merge pull request #887 from mitraj/dev-branch

Adding I18N support for Addresource pkg
"field inherited type and an enclosing
scope" issue resolved."
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #889 from mitraj/dev-branch

The field inherited type and an enclosing scope issue resolved
Fixed the tip message is in 3 lines instead of 1
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch