akash changes
Merge branch 'master' of https://github.com/hvisakash/disposal_manager

Conflicts:
	index.php
akash commited