Added idea files to gitignore
update to 1.4-SNAPSHOT
ignore intellij files
Merge branch 'master' into mley-member-fix

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/osiam/addon-administration