dictyBase/frontpage-dictybase — pull request #19 by biodavidjm (2014-11-13 21:06:48+00:00)
Title: Merging the commits from the master

I make changes on the master that I want to merge on develop as well (since I'll keep working on develop)