Update pom to fix apklib issue
Merge remote-tracking branch 'origin/stable' into stable

Conflicts:
	pom.xml