Enhanced the documentation
Added piwik to the template
Merge remote-tracking branch 'origin/master'