Added relations to comment model
Merge branch 'jbranch' into dev
Merge branch 'dev' of https://github.com/odesey/PartyCrashers into dev
Whitespace changes
Minor style changes
added custom google maps marker
Merge branch 'dev' into cukes

merging Joaquin's css changes.
added new files from merge