..
Merge branch 'master' into devv
..
Merge branch 'master' into devv
..
Merge branch 'master' of github.com:coolwanglu/pdf2htmlEX
Merge branch 'master' into devv

Conflicts:
	TODO
Merge branch 'master' into devv