Added missing link
Fixed commit conflict
Fixed note about encoding issue
Merge pull request #802 from wryck7/fix-zend-navigation

Fix zend navigation
Merge branch 'hotfix/802'

Close #802