Adding a distinct version number
Merge branch 'master' of https://github.com/sweis/e2e-exp

Conflicts:
	javascript/crypto/e2e/extension/manifest.json