merging vitor_testing into testing
- replacing most './' with CANTOSPACE variable (i.e ${CANTOSPACE}/)
- commenting line 273, so that an empty file is not created and the rest of the scripts uses an old, non-empty file. just for testing.
Edited by Vitor Trovisco