20130806-amanda
Merge branch 'second_period' of github.com:lifang/lantan_BAM into second_period