Merge branch 'master' of https://github.com/samilliken/openDCIM into AndHam89-master

Conflicts:
	db-3.0-to-3.1.sql
	infrastructure.inc.php
Merge remote-tracking branch 'upstream/master' into AndHam89-master

Conflicts:
	db-3.0-to-3.1.sql
	infrastructure.inc.php
Sync db-3.0-to-3.1.sql
Comment out reporting on resource usage, some cleanups
Merge pull request #266 from AndHam89/master

Comment out reporting on resource usage, some cleanups