Added JIRA and GA statistics
Added google p12 key file location as a property, added log4J
Merge branch 'develop-cimaszewski' of https://github.com/siteadmin/SITE into develop-cwatson

Conflicts:
	sitenv/sitenv-statistics-portlet/.settings/org.eclipse.core.resources.prefs
	sitenv/sitenv-statistics-portlet/.settings/org.eclipse.jpt.core.prefs
	sitenv/sitenv-statistics-portlet/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
	sitenv/sitenv-statistics-portlet/.settings/org.eclipse.wst.common.project.facet.core.xml
	sitenv/sitenv-statistics-portlet/src/main/java/org/sitenv/portlets/statistics/controllers/StatisticsController.java
	sitenv/sitenv-statistics/src/main/java/org/sitenv/statistics/manager/impl/StatisticsManagerImpl.java
Performed a proper merge
Merge branch 'develop-cwatson' into develop-cimaszewski
Updated for Site statistics front page