pulled / db schema change
Merge branch 'master' of https://github.com/sproutke/ongair
Merge branch 'hotfix/group_reconciliation'
merged schema.rb
Merge branch 'release/new_home_page'
removed styles for contacts
Merge branch 'hotfix/remove_unneeded_image_sizes' into develop