Merge pull request #694 from extraordinaire/master

[ljubljana 2014] more bios
[ljubljana 2014] restore program template