updating the latest changes in trunk


git-svn-id: https://plugins.svn.wordpress.org/bolcom-partnerprogramme/trunk@966343 b8457f37-d9ea-0310-8a92-e5e31aec5664