Rename locale.en to locale.en.yml
formating change
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/locales/locale.en
Merge pull request #1 from Dandielo/master

Locale item updates