mdsol/crichton — pull request #137 by brutski (2014-03-18 13:04:15+00:00)
Title: merging develop into crichton-demo

@fosdev @sheavalentine-mdsol @jlo188 please merge.