Updated message.rb to remove attr_accessible call - no longer needed in new version of active_attr gem
Fixed merge conflicts