Doc pictures
Merge branch 'master' into dev

* master:
  Doc pictures

Conflicts:
	lisha1.00/doc_user/picture/._column_main_features.png