...

Signed-off-by: Bin <jiangbin81@gmail.com>
Merge branch 'master' of github.com:caniggia15/doc2