Add an easier way to toggle between languages in dev mode
Merge branch 'release/2014-11-11' into develop