[ljubljana 2014] add extra proposals
Merge pull request #684 from extraordinaire/master

[ljubljana 2014] add extra proposals