added inclusion of apache module to manifest
merged puppet-upstream-tree into local-tree
included apache and php module
Merge commit '678c5aeaac40eef4c73c3e197b3080c89ef4cc04'
fixed some bugs
Merge pull request #8 from SaschaSanJuan/puppet-bugfix

Puppet bugfix