Roll-up of changes between commit eed7253 and commit 3f2dc99.
Roll-up of changes between commit eed7253 and commit 3f2dc99.

merging changes from TFS

Merge tag 'TFS_C97'

Merge branch 'master' of https://github.com/SyncToday/synctoday2015

private folder is ignored



git-tfs-id: [https://davidpodhola.visualstudio.com/DefaultCollection]$/Sync.Today/Main/2015;C98

davidpodhola/synctoday2015,SyncToday/synctoday2015,SyncToday/synctoday2015,davidpodhola/synctoday2015,davidpodhola/synctoday2015,SyncToday/synctoday2015,davidpodhola/synctoday2015,davidpodhola/synctoday2015