first commit of the day
Merge branch 'master' of https://github.com/hvisakash/disposal_manager

Conflicts:
	admin/ajaxcalling.php
	classes/user.php