Removing .classpath and .project files
Updating .gitignore
Merge branch 'master' of github.com:idega/com.idega.block.email into BRANCH_PLATFORM_5

Conflicts:
	.classpath