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

    • #cf1e1e2 — Define flex entities. (Ivan Enderlin, 2013-10-15)
    • #6c3ed00 — Better composer compatibility (jubianchi, 2013-10-15)

---

Merge remote branch 'library-socket/master'