Modified the css file
Merge branch 'master-branch'
Testing Conflict
Testing conflicts
Manually fixed conflict

Conflicts:
	jquery-ui.css