Merge branch 'master' of https://github.com/martignoni/Chartbuilder into Localization
Merge branch 'Localization' of https://github.com/martignoni/Chartbuilder into Localization