Using Apache's encoder
Merge branch 'master' of github.com:idega/com.idega.manager into BRANCH_PLATFORM_5

Conflicts:
	.gitignore