re #615, #617 - Add 5446 & 5421 to v2 stage
Merge branch 'master' of git.assembla.com:timble-police.2