Merge branch 'master' of github.com:lnslbrty/naskpass

Conflicts:
	ui_statusbar.c
Merge branch 'master' of github.com:lnslbrty/naskpass

Conflicts:
	ui_statusbar.c