Ember + Sockets added
Merge branch 'pbmasigla'