New

New
Merge remote-tracking branch 'origin/master'

Conflicts:
	pmd/dashBoard/LaunchBar.view.js