1.modify

Change-Id: I4f12cd2f8993740bce98e14d1393dabb4d157f08
s
Merge remote-tracking branch 'origin/Data' into Data

Conflicts:
	My_module/Data_base/lina.db
	My_module/My_1st.e4p
	My_module/Ui_query_form.py
	My_module/Ui_query_form.pyc
	My_module/_eric4project/My_1st.e4q
	My_module/_eric4project/My_1st.e4t
	My_module/lina.db
	My_module/query_main.py
	My_module/statistic/Ui_queryform.py
	My_module/statistic/pygrid_rc.pyc
	My_module/statistic/queryform.py
	My_module/statistic/records.pyc
	My_module/statistic/util.pyc