Added jquery ui rails gem
Added jquery ui rails gem
Merge branch 'develop'

Conflicts:
	Gemfile