luping0603
Merge branch 'master' of github.com:lifang/lantan_BAM

Conflicts:
	nbproject/private/rake-d.txt