Added missing link
Fixed commit conflict
Fixed note about encoding issue
Merge branch 'version/bump'

Back to dev
Merge pull request #802 from wryck7/fix-zend-navigation

Fix zend navigation
Merge branch 'hotfix/802' into develop

Forward port #802