Added crowd integration
Merge branch 'crowd'

Conflicts:
	attributes/default.rb