fix conflicts
adjusts
Merge pull request #653 from devton/ch_partners

Added partners into channel, now channel owners can add they partners on the channel page
added sign_in_count to jason generated for analytics
separated logged in from signed up events in mixpanel JS view
added mixpanel-ruby gem to track contribution confirmation through the backend
added mixpanel tracking in a separate observer (in case someone wants to remove mixpanel tracking) and added tracking events for contribution confirmation
added link to partners at channels header
stubbed Mixpanel::Tracker new in all specs to avoid mixpanel tracking during tests
bring current_date to ruby to avoid time zone problems generating current_date (the DB is UTC always).
fixing spec problems with stubing of mixpanel observer
fixed database function can_cancel to take into account the timezone
only show partners if channel has partners
remove name and add image size
forgot to remove to name from title of image
remove name from admin
Merge pull request #654 from diogob/mixpanel_observer

Mixpanel observer
added channel partners path into menu handler
fix devise erros to show filed name on error message #67854800
fixing error messages for devise reset password token [12070026]