Fix http://www.concrete5.org/developers/bugs/5-7-2-1/template-autonav-block-duplicates/
Merge branch 'develop' of github.com:concrete5/concrete5-5.7.0 into develop