Solved bugs in the migration of Campus Party demos

Change-Id: I146f8d8d198091c53d098e27f839d7007cad9658