*changed compass-rails because it breaks with rails 4
Merge remote-tracking branch 'origin/master'