Fixed unit tests problems related to LocaleProxy
Merge branch 'master' of github.com:bedatadriven/activityinfo