Merge remote-tracking branch 'gerry/nclusion' into develop
got rid of debugging code in coffee
Merge branch 'develop' into nclusion