Enable ntp in all servers
Merge branch 'travis' into ntp
Update change log
Merge branch 'ntp'

Conflicts:
	CHANGES.md