exception handling at /extensions/assets/default/apis/assets.jag
Merge remote-tracking branch 'upstream/master'
resolve merge conflict
updated to upstream/master
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	modules/apps/publisher/extensions/assets/default/apis/assets.jag
removed overriding greg files: resources/.xsds,resources/rxts,conf/log4j.prpperties;

Conflicts:
	modules/distribution/src/repository/conf/log4j.properties
Merge pull request #19 from ayshsandu/master

Remove Overriding files coming from features by ES end