zwischenstand
zwischenstand
zs
Merged 'dev'.

Conflicts:
	Gruntfile.js
webworker gruntfile
zs
Merged 'dev'.
zs
removed comments
integrate randomString
Merged 'dev'.

Conflicts:
	app/comps/core/srvc-crypt.js
zs
Merged 'dev'.
zs
Merged 'dev'.

Conflicts:
	app/comps/conversations/srvc-conversation-model.js
rsa work with webworker
fiexs, test fixed (mtc)
zs signing
Merged 'dev'.
tests work for de- and encrypt with rsa