Consistent use of Joomla!
Merge branch 'staging' of github.com:joomla/joomla-cms into staging
Merge branch 'staging' of github.com:roland-d/joomla-cms into staging
Merge branch 'staging' of github.com:joomla/joomla-cms into staging
Adding option to use pipe ('|') as OR in search filter in Extension Manager: Manage
Merge branch 'staging' of github.com:roland-d/joomla-cms into staging
Merge branch 'staging' of github.com:joomla/joomla-cms into staging
Extending pipe search/filter functionality to Modules, Plugins, and Templates as well
Fixing some phpDoc comment problems
Fixing some more phpDoc comment problems
Fixing some code style issues (new lines before foreach)
Fixing some code style issues (new lines before foreach)
Merge branch 'staging' of github.com:joomla/joomla-cms into staging
Merge branch 'staging' of github.com:joomla/joomla-cms into staging
Merge branch 'staging' of github.com:joomla/joomla-cms into staging
Merge branch 'staging' of github.com:joomla/joomla-cms into staging
Merge branch 'staging' of github.com:joomla/joomla-cms into staging
Merge branch 'staging' of github.com:joomla/joomla-cms into staging
Article Manager: Articles > Moved "Trash" button to the right

See overall issue Inconsistency in order of admin "edit" etc buttons
https://github.com/joomla/joomla-cms/issues/4963

This patch is a replacement patch for patch http://issues.joomla.org/tracker/joomla-cms/4964
Category Manager: Articles > Moved "Trash" button to the right

See overall issue Inconsistency in order of admin "edit" etc buttons #4963

This patch is a replacement patch for patch http://issues.joomla.org/tracker/joomla-cms/4965