Define flex entities.
Better composer compatibility
[auto] Merge from Router

    • #ef19cfd — Define flex entities. (Ivan Enderlin, 2013-10-15)
    • #01bb48f — Better composer compatibility (jubianchi, 2013-10-15)

---

Merge remote branch 'library-router/master'