Add support for htpasswd protection
Merge pull request #397 from fh/t/htpasswd-hhvm

Add support for htpasswd protection
Feature: Use get_domains for getcourse vagrant domains
Update: apt cookbook 2.5.3
Bugfix: Adapting apt spec tests to our setup
Merge pull request #404 from fh/t/apt-update

Update: apt cookbook 2.5.3
Merge pull request #403 from till/t/getcourse-domains

Feature: Use get_domains for getcourse vagrant domains
Merge branch 'master' into t/remove-domainconf

Solved Conflicts:
	nginx-app/recipes/getcourse-api.rb
	nginx-app/recipes/getcourse-ff.rb