commit
Merge branch 'master' of https://github.com/fanxiaochen/BloomingFlowers

Conflicts:
	include/blooming/point_cloud.h
	src/lily/pick_handler.cpp