Added new class for duplicate org repair

USERGRID-1351
Final pass of org merge

USERGRID-1351
Merge branch 'master' into USERGRID-1351

Conflicts:
	tools/.gitignore
Merge pull request #90 from apigee/USERGRID-1351

Usergrid 1351