upd
Merge remote-tracking branch 'origin/master'

Conflicts:
	jquery-presentation/jquery_for_ppd.pptx
upd