update
Merge remote-tracking branch 'origin/kitkat' into kitkat

Conflicts:
	cpa.dependencies