change version to sprint7
Merge branch 'tao' into sprint7