Did an attempt at Ntp synchronisation and changed some gradle stuff
Merge remote-tracking branch 'origin/master'