Merge branch 'master' into develop
Fix the navigation bar

(also known as the 'Pablo is Awesome' patch)
Merge branch 'fix-navbar' into develop
Merge branch 'develop'
Merge branch 'master' into elDorado
Minor changes