[ljubljana 2014] program finalised
Merge pull request #696 from extraordinaire/master

[ljubljana 2014] program finalised