Update times
Add devise crap
Add wedding party
fix broken site
Merge remote-tracking branch 'heroku/master'