Rebuild Gemfile.lock w/o jquery-rails & bootsrap-sass
Merge branch 'master' into Mongoid

Conflicts:
	PlanetExpress/Gemfile.lock