Merge branch 'master' of https://github.com/vulk/www-elilxirconf-2014
Merge branch 'master' of github.com:jfreeze/www-elilxirconf-2014
udpated panel