Added WCVI2011 herring example to IPHC-developer
Change model controls for Arrowtooth.
Fix merge with  martell
Fixed merge conflicts