update vendors
update administrator
Merge branch 'feature/framework_upgrade' into develop