adding owned_cameras to Weekly Render script
Merge remote branch 'upstream/master'

Conflicts:
	python2.6libs/weekly_render.py
fixed weekly render for new paths and mantra nodes
Local Main render works.
.exr instead of .tif
Merge pull request #160 from eestrada/master

 Added new Hair Ubershader otl asset
fixed conflict
Merge pull request #158 from ebrayton/master

Weekly Render Script
Unlock tool added in maya
Merge pull request #161 from melissaEdge/master

Unlock tool for Maya added
Confirm dialog fix
Merge pull request #162 from melissaEdge/master

Confirm dialog fix