Merge remote-tracking branch 'remotes/upstream/master' into MultilingualGUI2

Conflicts:
	DroidPlanner/res/values/strings.xml
Merge branch 'MultilingualGUI2' into DEVmaster