Added support for models and controllers comming from engines
Added support for models and controllers comming from engines, commited missing options file
updates to engine support
Merge branch 'master' into engine_support_updates
Merge pull request #80 from primableatom/engine_support_updates

Engine support updates