added modules from mac
Merge remote-tracking branch 'remotes/origin/master' into HEAD

Conflicts:
	.idea/modules.xml