amanda
Merge branch 'second_period' of https://github.com/lifang/lantan_BAM into second_period
new app api
merge conflict