Bootstrap and jQuery-UI Bootstrap updated...
Merge branch 'master' of github.com:francocatena/x0y0

Conflicts:
	Gemfile
	Gemfile.lock