page forbidden tweak because area is wrong anyway
gettin ready for 5.6.2.1 awwwww JEAH
Fix BlockController::getUniqueIdentifier()

Fix `BlockController::getUniqueIdentifier()`

- Use `getBlockID()` no `getIdentifier()` as `getIdentifier()` will
  already append the BLOCK_ prefix resulting in BLOCK_BLOCK_
Fix Merge Comment in db.xml

Fix Merge Comment in db.xml file
Merge pull request #1290 from mkly/fix_merge_comment_in_file

Fix Merge Comment in db.xml
changed getting identifier of proxy block to controller::getOriginalBlockID from getBlockID because of undefined method errors
Merge branch 'master' of https://github.com/concrete5/concrete5 into production-5.6.2

Conflicts:
	web/concrete/core/libraries/block_controller.php