Analytics
Merge branch 'master' of https://github.com/rodia/y2tool.git

Conflicts:
	application/views/admin/header_view.php