Renamed newGroup to updatedGroup
Updated README.md to reflect master merge in 3akai-ux
Updated license header + renaming sakaiproject to oaeproject
Merge branch 'master' of github.com:oaeproject/Hilary
Merge branch 'master' into sakaiprojectCleanup

Conflicts:
	node_modules/oae-content/tests/test-content.js
Replacing sakaiproject with oaeproject
Fixing search problem
Reset config file
Self review
Fixed invalid license URL
Attempted fix for test failure
Merge branch 'master' of github.com:oaeproject/Hilary
Merge branch 'master' into sakaiprojectCleanup
Switched Travis to oaeproject
Merge branch 'master' of github.com:oaeproject/Hilary

Conflicts:
	node_modules/oae-principals/tests/test-groups.js
Merge branch 'master' into sakaiprojectCleanup
Merge pull request #536 from nicolaasmatthijs/sakaiprojectCleanup

License + URL clean-up