ws
Merge branch 'printing' of https://github.com/anrong/ACQuote into printing

Conflicts:
	.idea/workspace.xml