20140917
Merge branch 'master' of https://github.com/fanhuan/AAF