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
add theme-a to route contact/edit
Merged 'dev'.
style update contact edit page / contact create page
style update contact import page
put debug to false
update avatar drtv, rm mock add class for unknown avatar
zs
Merged 'dev'.

Conflicts:
	app/comps/conversations/srvc-conversation-model.js