Updated gitignore
enabling m2e plugin
Merge branch 'master' of github.com:idega/com.idega.block.calendar into BRANCH_PLATFORM_5