Start integrating resource bundle system, not yet completely translated though
Merge remote-tracking branch 'origin/master'