resource load fix
Merge branch 'master' of https://github.com/imre-szekeres/onlab2014_repo