added reload_templates() method
Merge branch 'master' into path_cache_spike

Conflicts:
	python/tank/api.py