permalinks tests updated with new rule
permalinks updated
Merge branch 'develop' into testing