Remove strtoupper calls
Merge remote branch 'origin/master'
More strtoupper removal
Do not force uppercase for device information.
Merge branch 'master' of git://github.com/samilliken/openDCIM
Add missing "<?php" for Data Center config block
Merge branch 'master' of github.com:hawson/openDCIM
Merge branch 'master' of git://github.com/samilliken/openDCIM
Merge branch 'master' of github.com:hawson/openDCIM

Conflicts:
	assets.inc.php
	cdu_templates.php
	device_templates.php