add localization support
Merge branch 'localization'

Conflicts:
	locale/de-DE.properties
add localization support
Merge branch 'localization'

Conflicts:
	locale/de-DE.properties
	locale/en-US.properties