Added basic auth support for apache
Merge branch 'apache_basic_auth'

Conflicts:
	attributes/default.rb