Fixes
Merge branch 'master' of https://github.com/sirolf2009/StatSocial

Conflicts:
	StatSocial/application/controllers/Socialdata.php
	StatSocial/application/controllers/Statistics.php
	StatSocial/application/views/pages/socialdata.php