fix some bugs related to hybrid projects ...
Merge branch 'dev' of github.com:dalehenrich/tode into dev