Hybrid automaton

Merge changes in HybridAutomaton into master. Note that some of the example files will be re-created in the old location, but we can move/remove them afterwards manually.