tests and ticket#1 implimentation
tests and ticket#1 implimentation
Merge branch 'ticket1_bio'

Conflicts:
	cups/settings.pyc