Merge branch 'master' of /Users/adrian_home/Desktop/EasyTransport/EasyTransport with conflicts.
Merge remote-tracking branch 'origin/master'
NewVersionOfDates
Merge remote-tracking branch 'origin/master'