Merge branch 'master' into stable
Support for timestamp in subscribe actions
Merge branch 'master' of http://github.com/devicehive/devicehive-.net into origin_master