Merge pull request #4 from PetrDlouhy/master

Fix for Reportlab 3.0
Bump version
Merge branch 'master' of https://github.com/PetrDlouhy/InvoiceGenerator into PetrDlouhy-master
Reformatting testing files
Bump version
The displayed number of pages only when there is more than one
Merge remote-tracking branch 'upstream/master'

Conflicts:
	setup.py