deepak commit
deepak cimmit
Merge branch 'master' of https://github.com/hvisakash/disposal_manager

Conflicts:
	classes/generator.php