User/Person models merge
houndci fixes
fix biography field as text, not string
hound fixes
style fixes
fix in parameters
Merge pull request #262 from differentreality/final_user_model

User/Person models merge
Merge pull request #277 from differentreality/wip_registration_fix

fix in parameters
Adds instagram url to conference
Adds instagram fontawesome icon to splash and reverting the description for slideshare & speakerdeck to have media ids instead of link

Adds test for instagram url to conference show
Merge pull request #271 from gopesht/fix_social_media

Fix social media
Gallery initiated
Multiple ajax calls fixed
Putting the js inside ready function
Conditional rendering for gallery button in the splash
Increased size of modal, added description as caption to photos
Merge pull request #279 from gopesht/gallery

Implements Gallery
Adding woff version of google fonts in splash
Integration of markdown with redcarpet gem
Merge pull request #280 from gopesht/fonts

Adding woff version of google fonts in splash