Merge branch 'localization' of https://github.com/buttercookie42/fennec-plus into localization

Conflicts:
	locale/de-DE.properties
	locale/en-US.properties
Merge branch 'localization'