Added missing files and updating.
Fixing unnecessary link problem.
Merge remote-tracking branch 'origin/trunk' into multiscale