Pull from transifex
Merge branch 'master' of github.com:dschuermann/ntp-sync

Conflicts:
	NTPSync/src/main/res/values-it/strings.xml