Update bower.json
Update _emphasis.scss

Corrected some classes that had descendentName instead of modifierName
Corrected Form-control state classes
Merge branch 'master' into develop

Conflicts:
	bower.json