edited conf.py
finished cache development
merged cache_dev