Fixed client edit mode. Updated for newest nailed-gradle and cleanup