Upgrade CMS, and add CommerceAddinAreaRegistration so we can append data tokens to routes and allow addins to use commerce area shared views
Merge branch 'dev'