cvs update to 2014-04-29; keep conflicts

remove auth2-jpake.c jpake.c schnorr.c
resolve & make compile