colspan example
Merge branch 'gh-pages' of https://github.com/bpampuch/pdfmake into gh-pages

Conflicts:
	build/pdfmake.min.js
	build/pdfmake.min.map