Merge branch 'master' of https://github.com/warrenbuckley/Analytics

Conflicts:
	Analytics.Site/App_Data/Logs/UmbracoTraceLog.txt
	Analytics.Site/App_Data/Logs/UmbracoTraceLog.txt.2014-01-04
	Analytics.Site/App_Data/Umbraco.sdf
	Analytics.Site/App_Plugins/Analytics/account.config
	Analytics.Site/App_Plugins/Analytics/profile.config
	Analytics.Site/App_Plugins/Analytics/settings.config

Author: Tim Geyssens