(Backport from Kaiten)

Conflicts:

	build.xml
	default.properties
	plugins/ActionBar/project.properties
	plugins/QuickAction/project.properties
	plugins/SplitView/ant.properties
	plugins/SplitView/build.xml
	plugins/SplitView/local.properties
	plugins/SplitView/proguard.cfg
	plugins/SplitView/project.properties
	project.properties