Merge branch '1.1.x'
Merge remote-tracking branch 'origin/1.1.x'
Merge branch '1.1.x'
Setting dependencies correctly
Adding additional dependencies
Moving inclusion of database class to inside the defined type for
database
Fixing server name
Adding vhost for basic html