changed production for heroku css
Merge branch 'matestster' of heroku.com:dry-dusk-3157
  Merge branch 'master' of https://github.com/mmessing/SalesforceHackathon2014
  Merge branch 'master' of https://github.com/mmessing/SalesforceHackathon2014
  Merge branch 'master' of https://github.com/mmessing/SalesforceHackathon2014
Merge pull request #13 from mmessing/caryli

Added Message Scaffold
set more user info from fb
Merge branch 'master' of https://github.com/mmessing/SalesforceHackathon2014
doge popups
merge quinn updates
image upload
merge conflicts
Merge pull request #15 from mmessing/austinkwok

Austinkwok
spread random doges, pointerevents on map top
merge master
generated mailer, added mailers views
Merge pull request #16 from mmessing/mikeyu

generated mailer, added mailers views
 Merge branch 'master' of https://github.com/mmessing/SalesforceHackathon2014
starting seed branch
fixed relations in db by adding foreign keys and depencies