Windows Phone sln update + ConcurrentDictionary change for Dictionary + lock
Fixed merge conflicts.
Merge branch 'vcotlearov-WPbranch'