Merge branch 'master' of https://github.com/KatyCain526/centerforopenscience.org
Merge branch 'communities-addition' of https://github.com/jlcohoon/centerforopenscience.org
Merge branch 'communities-addition' of https://github.com/jlcohoon/centerforopenscience.org
add hover effect to icon
created buttons for journals tab on the opportunities page
fixed merge conflicts
fixed links, added grants
allow linking to grants, fix links
Merge branch 'communities-addition' of http://github.com/jlcohoon/centerforopenscience.org

Conflicts:
	www/involved_opportunities.mako
	www/static/css/custom.css