modified:   lib/java_card_kit-2_2_2/bin/apdutool
	modified:   lib/java_card_kit-2_2_2/bin/capdump
	modified:   lib/java_card_kit-2_2_2/bin/capgen
	modified:   lib/java_card_kit-2_2_2/bin/converter
	modified:   lib/java_card_kit-2_2_2/bin/cref
	modified:   lib/java_card_kit-2_2_2/bin/exp2text
	modified:   lib/java_card_kit-2_2_2/bin/jcwde
	modified:   lib/java_card_kit-2_2_2/bin/libjpcsclite.so
	modified:   lib/java_card_kit-2_2_2/bin/scriptgen
	modified:   lib/java_card_kit-2_2_2/bin/verifycap
	modified:   lib/java_card_kit-2_2_2/bin/verifyexp
	modified:   lib/java_card_kit-2_2_2/bin/verifyrev
	modified:   lib/samples/pcsc-lite/pcsc_demo
	deleted:    lib/tex/logoUR.png
	deleted:    lib/tex/structures.sty
Merge branch 'master' of github.com:smartSocialNetwork/project

Conflicts:
	misc/cr_21.01.13
	modified:   lib/gpshell-1.4.4/helloInstall.txt
toto
toto2
toto3