works?
Merge branch 'master' into ben

Conflicts:
	moduleB/build.config.js
just standard bower"