Makefile featurecast
Merge branch 'calipso-integrated' of https://github.com/harnen/calipso-integrated into calipso-integrated