Signed-off-by: Carlos Sanchez Witt <carlos.sanchezwitt@epfl.ch>
Merge branch 'master' of git@github.com:sinlab-semester-2013/VirtualActor.git