Merge branch 'jp1678' of https://github.com/jaypoulz/rSENSE
Merge branch 'master' of github.com:isenseDev/rSENSE
adding db schema
Merge branch 'master' of github.com:isenseDev/rSENSE
Merge branch 'master' of github.com:jdalphon/rSENSE

Conflicts:
	db/schema.rb
Merge branch 'master' of github.com:isenseDev/rSENSE
Merge branch 'master' of github.com:isenseDev/rSENSE
updating old branch
Allowing users to feature their own visualization images, also allowing them to delete the default image. More in pull request
need to make cops happy
Merge branch 'master' of github.com:isenseDev/rSENSE into jd_issue1775-1712
Permitting featured media id to be set by visualizations controller. Note, aliasing an attribute does not save it from needing to be whitelisted
Merge pull request #1858 from jdalphon/jd_issue1775-1712

Featured Media for Visualizations