save cc on authorize
merge cc to authorize
some fix on merge conflicts
move authorize.Environment to settings