Merging with svn
Merge branch 'master' of github.com:blobaugh/jetpack

Conflicts:
	_inc/genericons.php
	_inc/genericons/Genericons-Regular.otf
	_inc/genericons/README.txt
	_inc/genericons/example.html
	_inc/genericons/font/genericons-regular-webfont.eot
	_inc/genericons/font/genericons-regular-webfont.svg
	_inc/genericons/font/genericons-regular-webfont.ttf
	_inc/genericons/font/genericons-regular-webfont.woff
	_inc/genericons/genericons.css
	_inc/images/module-icons-sprite-2x.png
	_inc/images/module-icons-sprite.png
	_inc/jetpack.css
	class.jetpack-debugger.php
	class.jetpack-heartbeat.php
	class.jetpack-user-agent.php
	class.jetpack.php
	class.photon.php
	functions.opengraph.php
	jetpack.php
	languages/jetpack-ar.mo
	languages/jetpack-ar.po
	languages/jetpack-az.mo
	languages/jetpack-az.po
	languages/jetpack-bs_BA.mo
	languages/jetpack-bs_BA.po
	languages/jetpack-ca.mo
	languages/jetpack-ca.po
	languages/jetpack-cs_CZ.mo
	languages/jetpack-cs_CZ.po
	languages/jetpack-da_DK.mo
	languages/jetpack-da_DK.po
	languages/jetpack-de_DE.mo
	languages/jetpack-de_DE.po
	languages/jetpack-el.mo
	languages/jetpack-el.po
	languages/jetpack-es_ES.mo
	languages/jetpack-es_ES.po
	languages/jetpack-fa_IR.mo
	languages/jetpack-fa_IR.po
	languages/jetpack-fi.mo
	languages/jetpack-fi.po
	languages/jetpack-fr_FR.mo
	languages/jetpack-fr_FR.po
	languages/jetpack-gl_ES.mo
	languages/jetpack-gl_ES.po
	languages/jetpack-he_IL.mo
	languages/jetpack-he_IL.po
	languages/jetpack-hr.mo
	languages/jetpack-hr.po
	languages/jetpack-hu_HU.mo
	languages/jetpack-hu_HU.po
	languages/jetpack-id_ID.mo
	languages/jetpack-id_ID.po
	languages/jetpack-it_IT.mo
	languages/jetpack-it_IT.po
	languages/jetpack-ja.mo
	languages/jetpack-ja.po
	languages/jetpack-ko_KR.mo
	languages/jetpack-ko_KR.po
	languages/jetpack-lt_LT.mo
	languages/jetpack-lt_LT.po
	languages/jetpack-mk_MK.mo
	languages/jetpack-mk_MK.po
	languages/jetpack-my_MM.mo
	languages/jetpack-my_MM.po
	languages/jetpack-nb_NO.mo
	languages/jetpack-nb_NO.po
	languages/jetpack-nl_NL.mo
	languages/jetpack-nl_NL.po
	languages/jetpack-nn_NO.mo
	languages/jetpack-nn_NO.po
	languages/jetpack-pl_PL.mo
	languages/jetpack-pl_PL.po
	languages/jetpack-pt_BR.mo
	languages/jetpack-pt_BR.po
	languages/jetpack-pt_PT.mo
	languages/jetpack-pt_PT.po
	languages/jetpack-ro_RO.mo
	languages/jetpack-ro_RO.po
	languages/jetpack-ru_RU.mo
	languages/jetpack-ru_RU.po
	languages/jetpack-sa_IN.mo
	languages/jetpack-sa_IN.po
	languages/jetpack-sk_SK.mo
	languages/jetpack-sk_SK.po
	languages/jetpack-sq.mo
	languages/jetpack-sq.po
	languages/jetpack-sr_RS.mo
	languages/jetpack-sr_RS.po
	languages/jetpack-sv_SE.mo
	languages/jetpack-sv_SE.po
	languages/jetpack-th.mo
	languages/jetpack-th.po
	languages/jetpack-tr_TR.mo
	languages/jetpack-tr_TR.po
	languages/jetpack-uk.mo
	languages/jetpack-uk.po
	languages/jetpack-ur.mo
	languages/jetpack-ur.po
	languages/jetpack-zh_CN.mo
	languages/jetpack-zh_CN.po
	languages/jetpack-zh_TW.mo
	languages/jetpack-zh_TW.po
	lib/class.color.php
	lib/tonesque.php
	modules/after-the-deadline/install_atd_l10n.js
	modules/carousel/jetpack-carousel.css
	modules/carousel/jetpack-carousel.js
	modules/carousel/rtl/jetpack-carousel-rtl.css
	modules/comments/base.php
	modules/contact-form/grunion-contact-form.php
	modules/custom-post-types/comics.php
	modules/custom-post-types/testimonial.php
	modules/featured-content/featured-content.php
	modules/gplus-authorship.php
	modules/gplus-authorship/admin/listener.js
	modules/gplus-authorship/admin/ui.php
	modules/infinite-scroll/infinity.js
	modules/infinite-scroll/infinity.php
	modules/infinite-scroll/themes/twentyeleven.php
	modules/module-info.php
	modules/publicize/assets/publicize.css
	modules/publicize/assets/publicize.js
	modules/publicize/assets/rtl/publicize-rtl.css
	modules/publicize/publicize-jetpack.php
	modules/publicize/publicize.php
	modules/publicize/ui.php
	modules/shortcodes/css/style.css
	modules/shortcodes/js/main.js
	modules/shortcodes/presentations.php
	modules/stats.php
	modules/subscriptions.php
	modules/theme-tools.php
	modules/tiled-gallery/tiled-gallery.php
	modules/videopress/videopress-admin.css
	modules/videopress/videopress.php
	modules/widgets/gallery/templates/form.php
	modules/wpcc.php
	readme.txt
	tests/test_class.jetpack.php
	tests/test_class.jetpack_photon.php.php