User Activity Management
Merge branch 'master' of https://github.com/hardik-panchal/brilliant

Conflicts:
	instance/front/controller/login.inc.php
	lib/utils_checklist.php