New adjustments for the timezone.xhtml screen. Issue #118
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main/webapp/admin/message_template.xhtml
	src/main/webapp/admin/timezone.xhtml
Merge remote-tracking branch 'upstream/master'
New interface and timezone settings on message-template. Issue #118
Merge pull request #206 from felipewmartins/master

New interface and timezone settings on message-template