Merge pull request #239 from eLobato/gh-pages

Add linux.conf.au talk to media
Add sprint 26 demo
Update 3.5.4_puppet_reports.md

Change the foreman-report_v2.rb.erb url to the one at 2.1_stable branch.
Puppet-foreman's master has no longer the file foreman-report_v2.rb.erb.
Merge pull request #241 from ripcurld00d/gh-pages

Update 3.5.4_puppet_reports.md