Merge branch 'master' of git://github.com/hbaragar/splashcon-joomla
Merge branch 'master' of git://github.com/hbaragar/splashcon-joomla
its a mess: http://splashcon.org/2013/program/keynotes
Merge pull request #11 from kuloun/master

A fix for the feader and the keynotes