dependencies
Conflicts:
	comfortable_mexican_sofa.gemspec
Merge pull request #309 from glebm/2.0-jquery-ui-fix

jquery-ui dependencies (2.0)