re #573 - Add rewrite rule for 5340 staging site
Merge branch 'master' of git.assembla.com:timble-police.2