update all files from template and estate program
Merge origin/master