BAC-131: User account API - reset password recovery flag
ADEN-82 Amazon Direct Targeted Buy to respect no ads variable
bugid-100209 | S:MTb br tags are now allowed in textareas
bugid-100209 | S:MTb br tags are now allowed in textareas
Merge pull request #550 from Wikia/bac-131-password-time-reset

BAC-131: User account API - reset password recovery flag
Merge pull request #557 from Wikia/aden-82-amazon-to-respect-show-ads

ADEN-82 Amazon Direct Targeted Buy to respect no ads variable
bugid-98131 JSlint found an issue in EditHub.js
BAC-132: check against token value for permission
hooks EditPhalanxBlock and DeletePhalanxBlock need to be checked for all users (BAC-136)
Merge branch 'dev' into phalanx-redoux