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

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