Dist for modules
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	gruntfile.js