zuki commit test
Merge remote-tracking branch 'origin/master'

Conflicts:
	DSMobileSupport2.2/src/activities/DownloadNewVersion.java