BAM publisher client
resolve conflicts
bam client
Bam Client
bam client
bam client
bam client
Merge remote-tracking branch 'upstream/master'
BAM Client
Bam client
Bam client
Bam client
Merge remote-tracking branch 'upstream/master'

Conflicts:
	modules/apps/publisher/modules/asset_api.js
Enable integration tests for java components
Enable integartion test framework for ES java components
Enable integration tests for ES java components
Enable integration tests for ES Java components
Merge remote-tracking branch 'upstream/master'

Conflicts:
	modules/distribution/src/assembly/bin.xml
log message correction
Merge pull request #33 from manojgunayadev/master

merge BAM client changes