Update pom.xml

Fixes #479
Merge branch '13.06' into 13.09
Merge branch '13.09'

Conflicts:
	analytics/src/main/webapp/js/lib/external/ext