Merge "Revert "Revert "Creates a simple deploy dialog using appcfg.""" into idea133