Merge remote-tracking branch 'upstream/master' into PagePropertiesDialog
Merge remote-tracking branch 'upstream/master' into PagePropertiesDialog
Merge remote-tracking branch 'upstream/master' into PagePropertiesDialog
Trasnlations.keys.php were overwritten
Need to fix sql statement to have 'defaultText' instead previously used 'key'
So that I can run query to populate dev's message table to have translations in it in order for PO to test it

message0editor.html got into this pull to update small change that James added to html editor
Merge pull request #70 from innaDa/FixTranslationsTable&htmlEditor

Fix translations table&html editor