Fixed style + localization bugs
Merge branch 'master' of https://github.com/openlab/OGDI-DataLab