Change encoding from ASCII to UTF-8
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	pom.xml