Ignoring classpath
Merge branch 'BRANCH_PLATFORM_5' of github.com:idega/com.idega.block.email into BRANCH_PLATFORM_5

Conflicts:
	.gitignore