Freaking stupid README for git to shut up
Importing nextgen into Maven
Merge remote-tracking branch 'origin/nextgen' into nextgen

Conflicts:
	README.md