Merge branch 'dev'

* dev:
  Revert "datatables with a subscription now use a client only collection"
  v0.1.16

Conflicts:
	lib/mixins/publish.coffee
v0.1.16
Merge branch 'dev'

* dev:
  v0.1.16
  Merge branch 'dev'