Upgrades the Rails and Rack
Merging
Adjusts on styles requested by eve
Merge remote-tracking branch 'origin/master' into moip

Conflicts:
	Gemfile.lock
Update gems and remove paypal-express