update in infra inventory
Merge pull request #66 from Gryphyn23/master

update in infra inventory
Merge remote-tracking branch 'upstream/master'

Conflicts:
	protected/modules/reports/views/infraInventory/index.php