oks
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

Change-Id: Iaa7fe9ca9cc22214f6115b6001c0b90c0c568b6b
xMerge 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

Change-Id: I908f93a4b0eb0d55ffe71bf65b23e5e594495360