Added zencoding module
Merge branch 'master' into scala

Conflicts:
	.gitmodules