Merge branch 'develop-1.7' into feature-1.7.0-migrate_flow

# Conflicts:
#	python/fate_arch/computing/spark/_table.py
#	python/fate_arch/session/_session.py
#	python/fate_arch/storage/__init__.py
#	python/fate_arch/storage/_session.py
#	python/fate_arch/storage/_types.py
#	python/fate_flow/apps/job_app.py
#	python/fate_flow/apps/table_app.py
#	python/fate_flow/apps/tracking_app.py
#	python/fate_flow/apps/version_app.py
#	python/fate_flow/components/reader.py
#	python/fate_flow/components/upload.py
#	python/fate_flow/controller/job_controller.py
#	python/fate_flow/controller/task_controller.py
#	python/fate_flow/db/db_models.py
#	python/fate_flow/entity/types.py
#	python/fate_flow/fate_flow_server.py
#	python/fate_flow/manager/resource_manager.py
#	python/fate_flow/operation/job_tracker.py
#	python/fate_flow/operation/task_executor.py
#	python/fate_flow/pipelined_model/pipelined_model.py
#	python/fate_flow/scheduler/dag_scheduler.py
#	python/fate_flow/scheduler/detector.py
#	python/fate_flow/scheduler/dsl_parser.py
#	python/fate_flow/scheduler/federated_scheduler.py
#	python/fate_flow/scheduling_apps/client/tracker_client.py
#	python/fate_flow/settings.py
#	python/fate_flow/utils/api_utils.py
#	python/fate_flow/utils/data_utils.py
#	python/fate_flow/utils/job_utils.py
#	python/fate_flow/utils/schedule_utils.py

.github/ISSUE_TEMPLATE/algorithm_implementation.md

@@ -0,0 +1,49 @@
+---
+name: New Algorithm
+about: implement a new algorithm
+title: '[WIP]implement algorithm xxx'
+labels: 'federatedml'
+assignees: 'mgqa34,dylan-fan'
+
+---
+
+# New Algorithm
+
+- Name:
+- Category:
+
+## Short Description
+
+## WIP
+
+- [ ] Main Code
+  - [ ] sub task 1
+  - [ ] sub task 2
+  - [ ] ...
+
+- [ ] Docs
+  - [Algorithm READMD.md](https://github.com/FederatedAI/FATE/fix_this_link)
+  - Add entry to `federatedml/READMD`
+
+- [ ] Pipeline
+  - [ ] code
+    - [ ] param
+    - [ ] component
+  - [ ] doc for new component
+
+- [ ] Example
+  - [ ] pipeline
+  - [ ] dsl
+  - [ ] benchmark_quality
+
+## Check and Acceptance 
+
+- [ ] PR
+  - [ ] add reviewer: @mgqa34 @dylan-fan 
+  - [ ] add assigner
+  - [ ] add labels
+  - [ ] link projects
+  - [ ] link this issue
+
+- [ ] Confirm `Params` consistent between `federatedml` and `pipeline`
+- [ ] Examples tested

.gitignore

@@ -9,6 +9,7 @@ __pycache__
 .project
 *.prefs
 _build
+venv
 
 # excluded paths
 /arch/core/target/

.gitmodules

@@ -1,8 +1,8 @@
 [submodule "fateboard"]
 	path = fateboard
 	url = https://github.com/FederatedAI/FATE-Board.git
-	branch = v1.6.0
+	branch = develop-1.6.1
 [submodule "eggroll"]
 	path = eggroll
 	url = https://github.com/WeBankFinTech/eggroll.git
-	branch = v2.2.1
+	branch = v2.2.2

cluster-deploy/README.md

@@ -724,7 +724,7 @@ In the fast mode, the minimization test script will use a relatively small data
 
 ```
 source /data/projects/fate/bin/init_env.sh
-cd /data/projects/fate/examples/toy_example/
+cd /data/projects/fate/examples/min_test_task/
 #Unilateral test
 python run_task.py -m 1 -gid 9999 -hid 9999 -aid 9999 -f fast
 #Bilateral test
@@ -860,4 +860,4 @@ Assuming that the number of CPU cores (cpu cores) is c, the number of Nodemanage
 
 egg_num=eggroll.session.processors.per.node = c * 0.8 / p
 
-partitions (roll pair partition number) = egg_num * n
+partitions (roll pair partition number) = egg_num * n