update grunttask
update gitignore
Quickstartguide in englischer Übersetzung
Handshake
Merge remote-tracking branch 'origin/dev' into dev
finish test
rm main.js from repo
update bustUrl replace
Merge remote-tracking branch 'origin/dev' into dev
rm old trust route
add imprint
fix timing in e2e tests
generate new private keys for each test run
removed trust from contacts overview
Finish authentication-route

Conflicts:
	app/base/main.js
fixed language files
Merged 'dev'.

Conflicts:
	app/base/main.js
zwischenstand