Changing encoding
Update gitignore
Restoring encoding
Merge branch 'master' of github.com:idega/com.idega.block.platform into BRANCH_PLATFORM_5

Conflicts:
	.gitignore