merged proxy-to-gravity updates, reorder for user edit dev
merged proxy-to-gravity updates, reorder for user edit dev

izakp/force,TribeMedia/force-public,izakp/force,artsy/force,anandaroop/force,dblock/force,xtina-starr/force,joeyAghion/force,mzikherman/force,cavvia/force-1,oxaudo/force,kanaabe/force,mzikherman/force,izakp/force,kanaabe/force,izakp/force,oxaudo/force,joeyAghion/force,erikdstock/force,joeyAghion/force,eessex/force,anandaroop/force,yuki24/force,eessex/force,artsy/force,artsy/force,mzikherman/force,dblock/force,yuki24/force,eessex/force,cavvia/force-1,erikdstock/force,kanaabe/force,oxaudo/force,cavvia/force-1,artsy/force-public,anandaroop/force,cavvia/force-1,yuki24/force,artsy/force-public,damassi/force,artsy/force,damassi/force,TribeMedia/force-public,damassi/force,damassi/force,xtina-starr/force,xtina-starr/force,yuki24/force,xtina-starr/force,erikdstock/force,oxaudo/force,mzikherman/force,erikdstock/force,anandaroop/force,eessex/force,kanaabe/force,dblock/force,kanaabe/force,joeyAghion/force