bringing adapter branch changes into master
bringing adapter branch changes into master
removing useless files
merging with master
merging with master