Merge branch 'master' of koala.cs.pub.ro:living-lab-site