Feature: Finish the Postgresql skeleton
Feature: Starting the tomcat skeleton
Merge branch 'master' of https://github.com/Kunstmaan/skylab

* 'master' of https://github.com/Kunstmaan/skylab:
  Feature: Finish the Postgresql skeleton