Inclucion de reportes y configuracion de trackeo, y creacion de cron

Inclucion de reportes y configuracion de trackeo, y creacion de cron
Merge branch 'master' of https://github.com/jhanlos/vwm

Conflicts:
	activity-tracking-portlet/docroot/Thumbs.db

activity-tracking-portlet/docroot/WEB-INF/src/com/liferay/consistent/tra
cking/portlet/ActivityTrackingPortlet.java

activity-tracking-portlet/docroot/WEB-INF/src/com/liferay/consistent/tra
cking/report/UserActivityPortletReport.java

activity-tracking-portlet/docroot/WEB-INF/src/content/Language.propertie
s

activity-tracking-portlet/docroot/WEB-INF/src/content/Language_es.proper
ties
	activity-tracking-portlet/docroot/html/tracking/site_log.jsp
	activity-tracking-portlet/docroot/html/tracking/user_log.jsp
	activity-tracking-portlet/docroot/html/tracking/view.jsp
del