updated registration
Merge branch 'master' into derek
update
Merge branch 'Blake'
manifest update
WOOHOO