Fixed debian/copyright
Merge branch 'debian' into ubuntu

Conflicts:
	debian/copyright