update empty row
move fb plugin to social
wysiwyg
updates
Merge branch 'master' into cake3

Conflicts:
	README.md