facebook meta
Merge branch 'gh-pages' of https://github.com/cabezud/jingle4 into gh-pages

Conflicts:
	index.html