Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
fix to display empty categories in settings tab
more WP coding guidelines fixes
Revert "more WP coding guidelines fixes"

This reverts commit c8aff0ab468b5be434cc735e20f274cbeef01138.
Revert "fix to display empty categories in settings tab"

This reverts commit df71d7b21bbb7aefb7987688f61cd2908dd77be5.
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
fix for translation credit
Merge branch 'refs/heads/master' into develop