Merge remote-tracking branch 'origin/master'

Conflicts:
	SocialCooking/domain/pom.xml
Delete ./idea and *.iml