JBEI/ice — pull request #2 by CandriaJones (2014-06-25 00:48:10+00:00)
Title: 4.0 dev

6/24/2014
merge 4.0 dev to master branch