Fixing unit tests on ogc-server-statistics
Merge remote-tracking branch 'origin/13.06' into 13.09
Merge remote-tracking branch 'origin/13.09'

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