Fixing special handling of presence type in the model instead of darn JS

Fixes #803

Conflicts:
	app/models/StreamRule.java