Merge remote-tracking branch 'origin/master'

Conflicts:
	ivy/ivysettings.xml

Upgraded ivy file to use chain
resolved conflicts in ivy settings
conflict resolution