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

    • #2ca08c7 — Define flex entities. (Ivan Enderlin, 2013-10-15)
    • #ec7bed1 — Better composer compatibility (jubianchi, 2013-10-15)

---

Merge remote branch 'library-websocket/master'