Merge pull request #228 from Alex-Diez/BETA_0_0

fix bug with locale
change tabs to fieldsets
Merge pull request #231 from Alex-Diez/BETA_0_0

change tabs to fieldsets
Merge pull request #232 from Black-Ink/BETA_0_0

Merge to Alfa 0.1
Merge pull request #233 from Black-Ink/ALFA_0_1

Merge to master