conflict changes

conflict changes
Merge branch 'nextgen'

This reverts commit 26656cefa76876da638dda028db6287bac5376f5.

Conflicts:
	README.md