localization complete
Merge branch 'localization' into development
changed date format