whitespace fixes
whitespace fixes
whitespace fixes
whitespace fixes
whitespace fixes
whitespace fixes
Merge branch 'master' into component-controller

Conflicts:
	Launchpad.control.js