Changes to satisfy SITE-601, SITE-573, SITE-120, SITE-572, SITE-382, and
SITE-589
SITE-618 and SITE-516
SITE defect - Added CCDA type name to the database
SITE-616: Created Graphs for Statistics using D3.js, still need to
update the graphs a bit
Added JIRA and GA statistics
Added google p12 key file location as a property, added log4J
SITE-651
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
Addressed the issue with the statistics being skewed.
Performed a proper merge
Merge branch 'develop-cwatson' into develop-cimaszewski
Updated for Site statistics front page
Updated to support direct send in the main page statistics
Updated to support all of the current statistics.

The only item currently missing is Sai's PD receive stats.
Updated to support SITE-679 and SITE-680
Completed the code merge; updated google analytics code to only make one
request for data.
Merge branch 'develop-cwatson' into develop-cimaszewski

Conflicts:

sitenv/sitenv-statistics-portlet/src/main/java/org/sitenv/portlets/stati
stics/controllers/StatisticsController.java
Merge branch 'develop-cimaszewski' into TEST

Conflicts:

sitenv/sitenv-statistics-portlet/src/main/java/org/sitenv/portlets/stati
stics/controllers/StatisticsController.java
Cumulative update
	- Fixing preference files in the TEST branch
	- SITE-683
	- SITE-617
	- SITE-679
	- SITE-680
	- SITE-678
	- SITE-603
	- SITE-573
	- SITE-540
	- SITE-616
	- SITE-618
	- SITE-634
	- SITE-651
	- SITE-652
	- SITE-665
	- SITE-666