Integrates locale selector
Merge pull request #167 from nsendetzky/2014-07-27_locale-selector

Integrates locale selector