Set prison_staff_info version lock to master
Merge branch 'feature/digital-comms' into release/20140828
Merge branch 'ad_notice' into release/20140828