conflict fix
conflict fix

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