ID#212: added missing place holders.
Removed class that is no longer required.
Removed no-longer-required wrapper class.
Removed old tag from APF.
Added further tags.
Merge branches 'master' and 'release-2.1' of https://github.com/AdventurePHP/code