added some attributes and a connection pool
Merge branch 'project1'
Presentation Hierarchy applied to the wrong folder
fix some small tweaks