added userfolder and gct_andrewstim
Merge branch 'master' of https://github.com/heimel/InVivoTools