Added back index.html in Apache (removed by mistake when http.conf was added)
Merge branch 'master' of github.com:merikan/skltp-puppet