added google+ and facebook like to default template
Merge branch 'master' of git://github.com/lunemec/wysiwyg

Conflicts:
	README.md