i18n versao 1.2.1
Merge branch 'master' of https://github.com/maicongouveia/projetoJSP2014

Conflicts:
	src/exemplo_en_US.properties