Option to use Apache as a frontend web server
Merge branch 'feature/apache2'

Conflicts:
	attributes/default.rb
Make it possible to run with PostgreSQL
Typo
Make Vagrant work with Postgres too
Merge branch 'fix/typo'
Merge branch 'feature/postgres'

Conflicts:
	attributes/default.rb
	metadata.rb