update rails gem to 4.0.3
update coffee-rails gem to 4.0.1
update sass-rails gem to 4.0.2
Merge conflict resolution