not working
ziwschenstand
now we do not need cameoSecrets to run tests, just to build phonegap app at adobe
Merged 'dev'.

Conflicts:
	Gruntfile.js
Finish extern-cameoSecrets
next try, still not working
add pubKey
Merged 'dev'.
Finish refactor-conversation
add key-pair drtv
add spinner
add html switches
updarte key handling

change localStorage key
Finish pgp-key-handling
new e2e tests
Merged 'dev'.
clear up packages.json working grunt target
new runner port
update port
Merge branch 'origin/feature-grunt-protractor'

Conflicts:
	test/e2e/with-token.dalek.js
	test/e2e/without-token.dalek.js
	test/e2e/wrong-route.dalek.js