added fix for content provider issue update
fixed validation for exceeded limit in narration_type,start,stop
Merge remote-tracking branch 'gooru/master'
Merge remote-tracking branch 'gooru/master'
upgraded spring version
Merge remote-tracking branch 'gooru/master'
Added validation for maximum character

Conflicts:
	gooru-core/src/main/resources/properties/message.properties
Merge branch 'master' of https://github.com/Gooru/Gooru-Core-API

Conflicts:
	api/src/main/resources/gooruContext-hibernate.xml
Added validation
resolved conflict
Merge branch 'master' of https://github.com/Gooru/Gooru-Core-API
resolve changes
Merge pull request #716 from prakashraja89/master

fixed validation for exceeded limit in narration_type,start,stop
Merge remote-tracking branch 'gooru/master'
added order support in get myworkspace API
Merge pull request #724 from skpcharles/master

added order support in get myworkspace API
Merge pull request #723 from viji-m/master

Changed the lenght of the username
fixed issue in getclasspageItem  API
Implemented api calls for Role CRUD Operations
Resolved Conflict