Recursive search for matching local files
Merge branch 'skydrive' into dev