reject models
Merge branches 'ProtocolWednesday' and 'ProtocolWednesday' of github.com:appiphony/Phillips into ProtocolWednesday

Conflicts:
	trends.html