Emails into develop#20

Merged

pzduniak merged 13 commits intodevelopfrom

Dec 28, 2014

Commits on Dec 19, 2014

Commits on Dec 21, 2014

Commits on Dec 26, 2014

SockJS support
pzduniak
committed

Commits on Dec 27, 2014