moved Settings to the right-corner menu
Revert "moved Settings to the right-corner menu"

This reverts commit 00ff0dfcece774ab86177b7a9b4ef9d6d3e7988d.
Settings nav item now opens the Settings modal
Merge branch 'fix/language-file' into feature/settings-modal
Merge remote-tracking branch 'origin/feature/settings-modal' into integration/20140927