ec2 dev
cache dir add extent
Merge branch 'master' into ec2dev

Conflicts:
	preCache.py
merge
a
merge
a