Merge branch 'update-1' of git+ssh://dev.laptop.org/git/journal-activity into update-1

Conflicts:

	po/de.po
	po/ne.po
