blank
Merge branch 'master' of https://github.com/marthall/jubileum

Conflicts:
	jubileum/contact/templates/contact/view-signed.html
	jubileum/databasen.db
merged