MOPM-7 Ignore .idea
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
MOPM-7 Remove invalid XML tag