improved update process.
merge
removed old file.
Merge branch 'test' into dev