Merge branch 'develop' of github.com:thanhsm/realtime into develop