Revert "Merge branch 'master' into production"

This reverts commit 9afbd273a4f83f89fc2eaa441a45642ef5291069, reversing
changes made to 10b7daf57c3470e5168b001d7614fd095f10c830.

Conflicts:
	js/phylo-lib/lang.module.js
	js/views/navBar.actions.js