[enh] added input validation, and jabber smp secret generation
[mod] deleted spurious .swp file
Merge branch 'master' of github.com:stef/privacy-challenge

Conflicts:
	site/webapp.py