24497 - registration controller changed to core

apple market
Merge pull request #256 from cannontech/master

24497 - registration controller changed to core
Merge pull request #257 from gsn/master

merge master to staging