formating change
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/locales/locale.en