char encoding hell
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/messages_pt.properties
updated to conventions 1.1.0