fixed language reference in dialog box for plugin disable form
Merge pull request #686 from DallasMuseumArt/upstream

fixed language reference in dialog box for plugin disable form
added wordpress config
when building belongsToMany relationships in controllers, the lack of a table name
alias causes an sql ambigious Id error
Merge branch 'develop' into dma-friends