Small grammar edit to template notice
fixed admin post type filters, closes #6312
Changelog bump for 2.2.5 changes
Fix infinite redirect loop on cart page

Fix for issue #6319:
https://github.com/woothemes/woocommerce/issues/6319
Tweak load_plugin_textdomain to be relative - this falls back to WP_LANG_DIR automatically. Can prevent "open_basedir restriction in effect".

@claudiosmweb agree? Load_plugin_textdomain needs a relative path. If
the locale isn’t found, it reverts to WP_LANG_DIR/plugins/ as you coded
it.
Merge branch 'master' of https://github.com/woothemes/woocommerce

Conflicts:
	readme.txt
Merge pull request #6301 from anagio/master

Small grammar edit to template notice
Merge pull request #6320 from ryanstockau/master

Fix infinite redirect loop on cart page
Fix - When bulk editing, don't allow sale price to be negative.

Fixes #6325
Check order exists before sending

Closes #6310
Fix adding items to orders

* Fix - When manually adding items to an order, show tax columns.
* Fix - When manually adding items to an order, include variation data.

Closes #6313
Added acceptance marks to PayPal Standard where applicable to replace generic PayPal icon.